am 06a5de5e: (-s ours) am 6c9d1af8: Merge "Remove non-ready support libs. DO NOT MERGE." into klp-modular-dev

* commit '06a5de5e8b2844dc7d90a3c4789dad84477a3e22':
  Remove non-ready support libs. DO NOT MERGE.