Snap for 8736885 from 57bc99fe63a1c4ee6f38c526e6575f668a1b8e77 to mainline-go-conscrypt-release

Change-Id: I3466f75cbf0b4534972a8ab3795e0b83bc8b7343
tree: 4ae1a7a76dcf7c7ef62fa9d9df0e0393c59e73ae
  1. 6515/
  2. 65xx/
  3. Android.mk
  4. METADATA