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

[automerger skipped] Merge "DO NOT MERGE: Revert "Add NEED_AIDL_NDK_PLATFORM_BACKEND"" am: 9680501c -s ours am: 72c70aff -s ours am: c1faa3b3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I26ad7ed3151d5d5e4aa471b4a0940c36c09e6812