Merge "header-abi-linker: Code cleanup" am: 9ed4f798d1
am: bd324bee47

Change-Id: If956781fbaa1f6eae0582489a6358520a835514d