Merge 211e7516b5a2c74789012e6d301a4bf197dac577 on remote branch

Change-Id: I63d0e341841ae315723b74d631e5aefe1f12fd87
tree: 51503410d01f20f2790ac565bf8a590d9dc73da9
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE
  6. OWNERS