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

Change-Id: Ibee03e89bff666f0dc33549580360f83240f2a3b