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

Change-Id: I678fa37eaffc5859d207fe3a01f61898615cb3de