[automerger skipped] Merge Android 12L am: 3f8e007cb5 -s ours am: 90fc1ab58f -s ours

am skip reason: Merged-In I30c537e980a9ceb16a7836d4f49e677a30b50b3b with SHA-1 d91c1d1bf5 is already in history

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

Change-Id: I84cdb07d61f8e1c2482e6313cc9fb4973feeed90
tree: 04d1de0f7ed6cfc985cd6b583e7376da1be00f62
  1. arm/
  2. arm64/
  3. common/
  4. x86/
  5. x86_64/
  6. Android.bp
  7. OWNERS