Merge stage-aosp-master into pi-dev-plus-aosp
am: 93f043db42

Change-Id: Ib754afeec7d93105074a9db7149aa13a84cd4c42
tree: 772ad4d717fc8033d22731eedea7b91b58719128
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags