Merge \"ART: disassembler_x86 doesn\'t recognize NOPs\"
am: 161c866ca7

Change-Id: I5b43d2844e64a74104bd916307b843165a4a12d3