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

Change-Id: I33fbc5c0943d8e382a00b30aef9185d6a2d39930