Merge "Fix map key in header-abi-diff while extracting user defined types."