DO NOT MERGE Update prebuilts to nyc-mr1-release@3306185
am: 6c60351dda  -s ours

Change-Id: I02100c64f291afc2b6abde82d6425085373cf16a