DO NOT MERGE ANYWHERE. Update prebuilts to 3357358 @ nyc-mr1-release
am: e19bbaf636  -s ours

Change-Id: I7f84d2dacc52d1fad2b251f756d51924c84a69a6