Merge "Added header-abi-linker."