Merge "header-abi-linker: Code cleanup" am: 9ed4f798d1 am: bd324bee47
am: 2aa33a82ec

Change-Id: I43401f9a7c38543009300f87986d042659baaa04