[DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build.

Change-Id: I8042b045f20b870de84ea7c4c060c3cbe1cdfe69
3 files changed