Merge "Fix map key in header-abi-diff while extracting user defined types." am: 326a4ed367
am: ac8aaaa1c3

Change-Id: I007eb8be7c1337397f7078dc9a39ada511caa71b