Merge 84968e099a85ba02e80c37fa997e26d95bc1fd22 on remote branch

Change-Id: I43fe9182bd76662ff692a06f63f1c5f7b9c5ddc8
tree: e6afc568066af9cdfb56a663e5d3cb376de837d9
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. OWNERS