Merge "Don't include AIDL NDK output if not needed" into main