[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 7fc43c6f35 -s ours

am skip reason: Change-Id I90e7f48a323370d47cbd029d8460b32a4151b2c4 with SHA-1 43af79dc58 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/vndk/v30/+/13122956

Change-Id: I806d26e926b93852c42185e962c176d7605f405b
tree: 46de6968d592ba1b863c4db387def6d6ea685a5f
  1. arm/
  2. arm64/
  3. common/
  4. x86/
  5. x86_64/
  6. Android.bp