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

Change-Id: I4d4868c2e915853f950fc830a80b83dabf1a4fd5