Merge "Revert "Revert "Rename vdex-fd to output-vdex-fd, add input-vdex-fd."""
am: ddb7b436c5

Change-Id: I34645adf760642ad9663d6fa77c72c9a2dad21ea