Merge "Remove dalvik/dexdump tool"
am: 669c968521

Change-Id: I85486007501d9a2a75012933afe6ad09e469447d