Merge c0d9bacb47f984962c4c9c82dfa4579d05357c08 on remote branch

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