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

Change-Id: I7cdf1552c49f51f7f633f09796453cdd6ce10a26