am 5d718dcd: Merge "ART: Fix x86 disassembler"

* commit '5d718dcd46a0a3c65b3635449d80947f342b1d2f':
  ART: Fix x86 disassembler