Merge "Fix map key in header-abi-diff while extracting user defined types." am: 326a4ed3 am: ac8aaaa1 am: 4626ec9a Change-Id: Ieeee12f778f54520d268b4ef83de16a2ac1e5699