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

* commit '5103d2cf2ddfe0fc8858c476cf961a1cc1e76d60':