am efbbd1d9: Merge "Fix sdk builds" into klp-modular-dev-plus-aosp

* commit 'efbbd1d98b2e16b8f0e2413460dcde92c77faf5a':
  Fix sdk builds