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

Change-Id: I0883a7ac747869a8d51acfa32964fbcc5dbccdd6