am 6c9d1af8: Merge "Remove non-ready support libs. DO NOT MERGE." into klp-modular-dev

* commit '6c9d1af8213394eb9458e71f2e6d62c4de716902':
  Remove non-ready support libs. DO NOT MERGE.