Merge abi diffs, improve linking performance.

Bug: 38325544

Test:
As shown by out/build.trace.gz when using built header-abi-linker to
link .sdump files produced by header-abi-linker.

Without fix:
Time taken to produce libc.so.lsdump by header-abi-linker => ~51 sec
With fix:
Time taken to produce libc.so.lsdump by header-abi-linker => ~3 sec

Bug: 38325929

Test: merged abiff reports of libjpeg, libc.

Merged-In: Ibfa85507b3f035f85b4678ac7a0a7bd0d4a9b966
Change-Id: Iae54f4754d8b0407fabdb8bc8550a7f7b3479f8f
(cherry picked from commit eb755c13)