Merge \"Implemented annotations display in dexdump.\"
am: e059b5b612

Change-Id: Ifbc4c721cf8f08d9bd2dc5422089d4f8ff48108d