Merge "New prebuilt" into nyc-dev
am: 93b34141b1

* commit '93b34141b1de89a8f176884c3ceb7bc968b252d0':
  New prebuilt

Change-Id: I677b6b38ff15f6c2e012c9c17780d2a060c3d86e