Merge "Fix aidl to cope with multiple collection types per method."