Merge 6f639811ea744e211b414ad5447bb3424b24a464 on remote branch

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