Merge "[pm] drop non-APK paths from LoadedApk makePath" into sc-dev