Merge "Add isBundled argument to LoadedApk.makePaths call"