Merge "If a profile is passed, we should always pass output-vdex and input-vdex." into oc-dev