Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master
tree: ab0eb11c7a49757c5467266a94a8c578edcbf151
  1. staticlibs/