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

Change-Id: Ieeee12f778f54520d268b4ef83de16a2ac1e5699