Merge "art: dex offset fix in oat_file.cc for x86_64"