am 36b65964: Merge "ART: Update and correct assemble_x86.cc"

* commit '36b65964d128471d917c2efc69c81bc50ef9360b':
  ART: Update and correct assemble_x86.cc