am 21852477: am 15704b1b: am d9bb6770: Merge "logd: 64-bit compile issue"

* commit '218524778a02ef53a74dcdbd17923441c3d90305':
  logd: 64-bit compile issue