am e68ec719: (-s ours) [DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build.

* commit 'e68ec719039406bfcc6cd8b1cab4890afbeb66a8':
  [DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build.