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

* commit 'c445f6f8165ec384f7e7e35c03b8cd889b1e146b':
  Fix minor issues that prevented DexFuzz to run on host.

Change-Id: I5345424d6bde1997d7e9ee0deaf2b488db075bcd