Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ic87abcef6997cd5e2ebeea38c1028b2570fe7e71
tree: ed7fe7a575a4a60c9b31eedd3dbb9db6596d42e3
  1. arm/
  2. arm64/
  3. common/
  4. x86/
  5. x86_64/
  6. Android.bp
  7. METADATA