Merge "Remove AIDL references from modules that don't have AIDL files" into nyc-support-24.1-dev