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

* commit '5ece703b190205243f9601a3eddb287ec808a084':
  Fix sdk build, really this time