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

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