Merge "HostStubGen: Add heuristics for AIDL classes" into main