am 4298bb21: am 7b68fb3b: Merge "x86_64: Clean-up after cmp-long fix"

* commit '4298bb219db34a83e18d7a8432fc473238a089de':