Merge "header-abi-linker: Code cleanup"