Merge \"Update prebuilts from build server\" into nyc-dev
am: 4001d7b6c4

Change-Id: I55f8a0231950e65338f111182a75b24b75e93c0d