Merge stage-aosp-master into pi-dev-plus-aosp
am: 50af6ca0bc

Change-Id: Ia57643ca6ba1aa70eec16c001f835b6ea236c6db
tree: d073c5f6f285c85dd7100ae92ad035c0d10160c5
  1. doc/
  2. include/
  3. src/
  4. tests/
  5. tools/
  6. Android.bp
  7. OWNERS