[automerger skipped] Merge Android 12 am: 2fb4af2536 -s ours am: bba0ae9a24 -s ours am: 16c5ebd67c -s ours am: bfc9682134 -s ours

am skip reason: Merged-In I9222a8945e6802e22b765fb053ed85eda688f805 with SHA-1 ec225826dc is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/vndk/v31/+/1847917

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