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

* commit '262ff10eb2d373e95677d2c9bead794dc4a43805':
  New non-priv prebuilt

Change-Id: Ibe03eddd5f0aaa7d06bfa0a0afc38fad1f5e10ac