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

Change-Id: I7752cd4a894e08f189992afaf35bbbf8b92b1a7b