Merge dece0536f8276830890a540afb2722aa0e8f971a on remote branch

Change-Id: Icef08989d6a35965aa6b239cee7845f45cf24dba
tree: 0c05e541d0bf920e4a0e2559daa8722d638a7db0
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS