Merge "Fix sdk build, really this time" into klp-modular-dev-plus-aosp