Merge stage-aosp-master into pi-dev-plus-aosp
am: 25c16242f0

Change-Id: I05c34bffac3785efeb71bb7ca67b83763d210b7d
tree: 40e3a51fe97e0f8750d33ac3050713269c5252cc
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. res/
  5. src/