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

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