Merge "public libs from APEXes are pre-loadable" am: 571e68efec
am: e34ff8e766

Change-Id: Ia235e5d47b6a6e43fede53dec3e194b951438053