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

* commit 'b3893926e8adc348edff440ee6c16f12bc204fd8':