Snap for 8512216 from 004a2dd5ea0d3a777520319536de119be1ba0049 to tm-frc-conscrypt-release

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