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

Change-Id: I399b98e3433ce228a5e95b4bfa6d3e1de0bff8ab