Merge "Fixed a few bugs in dexfuzz:"