Merge "Use input-vdex-fd, or input-vdex in dex2oat."
am: c3076fed3c

Change-Id: I222cd62436a944bbb770fada0e0d55dd895376c7