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

Merged-In: I27c720422d9dce022639dd1ca8463076fc22f135
Change-Id: I93a4188c21bab64d778578dc2d2fbfd6690db757
tree: 97cb78d10f4dde2a52707bb93aa7b83f288f7b75
  1. staticlibs/