Merge "DO NOT MERGE Revert "Load libraries directly from apk"" into lmp-mr1-ub-docs