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

* commit 'eaddc209bd33475257deaf668c40c07062e80a78':