Fix sdk imports to improve build size Original-merge: f85f7d2fe6e06109caca42c01353b8f688158b74 Merged-by: Joshua M. Boniface <joshua@boniface.me> Backported-by: Bill Thornton <thornbill@users.noreply.github.com>