Merge cherrypicks of [14883195] into sc-release

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