Merge ba57f43cf5df19486b4668f3e06ebdf9819626fe on remote branch

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