Merge "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."" am: 80a4f63d7e
am: d5417da67b

Change-Id: I532508a618531080f687dfbf7818cd5ec11b3d9e