Merge 47df70781d0c9fc781f31cefdc7411536ba0591e on remote branch

Change-Id: Ia25919b3a901f406cb33dd14fd833fb402dbf832
tree: 477bc8adab7f85eebbc42b7cdf47a7f2011fffe5
  1. res/
  2. src/
  3. .gitignore
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags