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