Merge "Use --oat-fd instead of --oat-file when calling dex2oat."