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

Merged-In: I1dcb9494598cdbdcdfe31cb78396f6e817768e55
Change-Id: I7452a5f39d9b55361153edf7919c59de59c8656c
tree: 25b75eb6f8866a57e23f4b4eadc8121e71e9fd60
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS
  5. PREUPLOAD.cfg