[automerger skipped] Merge "DO NOT MERGE: Revert "Add...

[automerger skipped] Merge "DO NOT MERGE: Revert "Add NEED_AIDL_NDK_PLATFORM_BACKEND"" into sc-qpr1-dev-plus-aosp am: bde105e6 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331592

Change-Id: Iba8633263ae649af783e94b01f5c1b5c6e042948