Merge "Revert "Disable input-vdex when doing speed-profile."" am: eebbf2e371
am: b8d5b100d1

Change-Id: Ia1f63e5b40cc049ead4cd47256874d4e4097690b