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

Change-Id: I8a5234b3d7cea2f53665ef23ae5392d3eed6653b