Merge 041b00e4187b569a1544644047e4322ab8545d8d on remote branch

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