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