Merge "Convert CombinedApis's GenerateAndroidBuildActions to use ModuleProxy." into main