Merge "Minor LoadedApk refactoring." am: 6ca155f8c2 am: e6fee297a2
am: 2fd131b492  -s ours

Change-Id: Idd758a3b1e0f18812c67187ab820859b239d1834