am 86b55c52: (-s ours) Fix klp-modular-dev-plus-aosp build

* commit '86b55c52c77bc11ebfe2372e6419a63a1a09be87':
  Fix klp-modular-dev-plus-aosp build