Merge "Merge abi diffs, improve linking performance."
am: ad9062a6c9

Change-Id: I80f24070af2f3d20a670087609bca5c0954a8d59