Merge "Add hostdex target for dalvik host tests"