Merge "Fix dex2oat/oatdump cross-compilation."