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

Merged-In: Ie5e87f1b20c960e81f9e1810e990e6fec8a328a1
Change-Id: If725c3f3855a518f218477e3b334772d23b672fa
tree: 482baab2e93b9dad4621d73fc6b81c313ef47ac4
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS