Merge "Avoid aidl usage on mac builds" into sc-dev am: 6123a6d95d am: 08384499d4

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

Change-Id: I9dc448d96a5c99a8c9b151f83964f7019626095e