Merge "Added header-abi-linker."
am: c28198423c

Change-Id: Id80ca5c50bb27a07200fa1742093b3c41b899f5f