Merge "Split the RsForEachStubParamStruct in two."