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

* commit 'e48ca6aeedcfc881209dd2a79cb31f54c10d8e1a':
  Remove non ready support libs. DO NOT MERGE.