Merge "Added more information in abi dump." am: 360aa525c6 am: 04a8870dc9 am: d0e4783572
am: 1f2763770d

Change-Id: Iffd1cdbe724ffbc552c3ae39e7672e0bac8b0f6d