Merge "Revert "Disable input-vdex when doing speed-profile."" into oc-dev