Merge "Fix minor issues that prevented DexFuzz to run on host."