Merge "ART: Update and correct assemble_x86.cc"