Merge d04531ecb87966495498ff5a1fd2b487ca1dd5a4 on remote branch

Change-Id: I1996e7018ffbf65f976d36da2747c4c4f31bef22
tree: f1978e24f683e733af9d745da54ccb25471f1853
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. NOTICE