Merge stage-aosp-master into pi-dev-plus-aosp
am: 5f7a68ed65

Change-Id: I8885534e5e57e309fa38fd4a8592053c5da62ec9
tree: 59b09c3ec7a34a33a547d64d7d3efe0ef041150d
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags