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

Merged-In: Iff5e1c768f03af5af75aa2c51004e17e8126ec6b
Change-Id: I64cc569f4c87a35e3dc486d8bed5fafe6165150a
tree: 5cca6c039b1e0406a69f8316a30350be62ce983e
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS