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

* commit '3f4855c11889470691673c15f05361df61ea95b2':
  cutils: trace 64-bit compile issues