am cab1fe86: (-s ours) SDK prebuilts sync 2303357. DO NOT MERGE ANYWHERE

* commit 'cab1fe8624d2a7f9684775b0d4a6103873eaed79':
  SDK prebuilts sync 2303357. DO NOT MERGE ANYWHERE