Merge "Revert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."""