Merge "Revert "Parse "vendor/priv-app" to find privileged applications"" into nyc-dev