Merge sc-dev-plus-aosp-without-vendor@7634622

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