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

Change-Id: I77edb9c1c8f68b42e55053fa44473562b766403a