Merge f2a79a9c15a52226285ea122226640ed74e01174 on remote branch

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