Merge "Added More Abi information."
am: 1345214bfc

Change-Id: Ic66c629b8b9ec2a40a91df57a85987314bbebb30