Merge "Fix dex2oat cross-compilation."