Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master
tree: 5dd04c99c0b2a165ca160e7123c15b39dd190cfe
  1. staticlibs/