Snap for 6838321 from 4237c162a1a2e47cf42f1f3ccf9b48dce9ec1100 to mainline-release

Change-Id: I44e795178a4479ae2c0cb4fcb5cf6f8e807771d1
tree: 6ac2616654bd263867f05ae394ee9526af458dcc
  1. tools/
  2. Android.bp
  3. METADATA