Merge "ref: Change vomtestgen and vdl tools flags from underscores to hyphens."