Merge "New non-priv prebuilt" into nyc-dev am: 262ff10eb2
am: f1e788dfce

* commit 'f1e788dfce59cc958a9dbe6416e849ff00e19508':
  New non-priv prebuilt

Change-Id: If5c9ce48fc1364f56266332f446288b4c1e28e2c