Merge b13ce1b60735ef7f892822788119f124a4ff4c1a on remote branch

Change-Id: I3dc841c509414bb18641fbeaddeb71a38fdec37b
tree: f9e6148942ed7b4beb574573588981aba590be3a
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS