Merge db0331b798ec93639700e7f00890b8aa42840ba7 on remote branch

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