Merge "Revert "Disable input-vdex when doing speed-profile."" into oc-dev
am: 9014ca88a9

Change-Id: Iee0d86d8f48539213a0b6d64d492858f95ae3fdb