Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: f5a5382f1b

Change-Id: Ic98dae4871956dbb45d1302c1757c8b0c94c78a7
tree: 8d9ce233176d05e2432c1f615a76cd938a553e8e
  1. 1.1/
  2. extns/
  3. halimpl/
  4. Android.bp
  5. OWNERS