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

Merged-In: Ife187297ea1acc0f5043a13011225bdb92ffc4f5
Change-Id: Ia571072792fc796184b306ed8a46507db8d12959
tree: cdd2af48218c6260a33265577f5c2a9c58ad40e1
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS