Merge "Fix package cleanup when parsed APK missing." into nyc-dev