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

Change-Id: I305fd763e69bc6d4836193397cb63f632e26a6a9