am 46f3ebba: am 28171447: Merge "cutils: trace 64-bit compile issues"

* commit '46f3ebba31d5820a08d0a638c9e261fbcea907a0':
  cutils: trace 64-bit compile issues