Merge "Add isBundled argument to LoadedApk.makePaths call" am: 0743d56e2b
am: 029170ee2b

Change-Id: Ia566854612ea9c9570fb8d7b6adc1a0e1e074d02