am f50a38a9: am 9462a31c: Merge "x86_64: Correct fix for cmp-long"

* commit 'f50a38a95e07df302d0684fa1340834647d98652':
  x86_64: Correct fix for cmp-long