Merge d33e3dc25d81468fed6eb7aa8aca49dd64706ef5 on remote branch

Change-Id: Ica18320ee8d036a8089f25a5ea20cbbfb45d8623
tree: 8827cd7b31f29de0427daef8f27c1f3ccc388926
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS