Merge 0eb252814cba32382ef5847929f2b2801552542b on remote branch

Change-Id: Ie61769f816f29785877ad6ac6ade7097f483167c
tree: 66ec966958ebd47eed4dc5d05eda27f6282983e2
  1. doc/
  2. include/
  3. src/
  4. tests/
  5. tools/
  6. Android.bp
  7. OWNERS
  8. TEST_MAPPING