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

Change-Id: Ia091e17be1738a0741c672cc9fcfcd6e3205d167