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

Change-Id: I03b5f1a11f066365834cabc5f3067393f78a4057