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

Change-Id: Id2976272c43aa04a92da3ee7024cf7b38574a84a