Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

Bug: 172690556
Merged-In: I90e7f48a323370d47cbd029d8460b32a4151b2c4
Change-Id: Ibaea9d687c5680c13c774a8d2c5edb7e9f4910c4
tree: 46de6968d592ba1b863c4db387def6d6ea685a5f
  1. arm/
  2. arm64/
  3. common/
  4. x86/
  5. x86_64/
  6. Android.bp