Merge "public libs from APEXes are pre-loadable" am: 571e68efec am: e34ff8e766 am: 85d758878f
am: 7f33423463

Change-Id: I3426ec0c651e39dd0364419c65fdec4e48cf4a75