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