Merge stage-aosp-master into pi-dev-plus-aosp
am: a5706ee495

Change-Id: I3c32aa6c9fb8eb174eacba3be4cbc91b9e4b9473
tree: c9a69d1fef938d4378569b24d3abaaab8dfc1a5e
  1. 1.1/
  2. extns/
  3. halimpl/
  4. Android.bp
  5. OWNERS