Merge 390adf6aa5d2e1131c2ccb5fb63b21ff80ec9a0a on remote branch

Change-Id: I659ec2edb873fec5ae2ea77128e383f035dedf7f
tree: 9ee9637ede2e655199bd6613c523745fea99c5b7
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk