Merge "Moving the LoadedApk class to its own file."