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