Merge "cutils: trace 64-bit compile issues"