Merge "Added header-abi-linker." am: c28198423c am: 34e6b07483
am: a5c1da7edb

Change-Id: I8519242883a6a6e00e652a8213d131704015b211