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

Change-Id: I142b1c3d0c9d035e33e1b85eeac4d43a1ab4d627