am f61ee144: am eaddc209: am daf3aa92: am 7b68fb3b: Merge "x86_64: Clean-up after cmp-long fix"

* commit 'f61ee14479d9ae1eb1a08da2ba7884bff1c2b9b2':