Merge "Avoid aidl usage on mac builds" into sc-dev