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

Change-Id: I3f8845e770c436abf5370ce77e57332574e5dbb1