Merge abi diffs, improve linking performance.
am: 1a9b3e2fc9  -s ours

Change-Id: Idc4b692ddd28fdedea1ed0c1daac326207d2590b