Merge "Don't include AIDL NDK output if not needed" into main am: 377dcaa9c5 am: 44b2212c2b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2795345

Change-Id: Idbde78d4ac6e4c819d1a46fd8919a452a88782c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>