Merge 769dfbbaf753cb2e4f5e60657c74fecb4b1b7cd2 on remote branch

Change-Id: I96da1326cc35aa33ffb32f52f4c6fdf47fa6f20e
tree: b46d585fa895c0a2c3cab6e462e8ae26d9d4ee0f
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags