Merge "Rename vdex-fd to output-vdex-fd, add input-vdex-fd."
am: 1a9cd642b7

Change-Id: Ia5c9aa8949393aad4ad712c4ceb487359c24d00e