Merge "Merge abi diffs, improve linking performance."