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

Change-Id: Idd8cb29042b52c2702e44d62fb4851fe5b818851