Snap for 6470414 from 4a88c0865fc02681b782dc6cc0e2e856322d2095 to mainline-release

Change-Id: I428bbe972390f4fa9cbc200396cf6f776377407f
tree: 12ebe2b71a6125b4e154b011283d4e69127fb91e
  1. src/
  2. Android.bp