am 52a442d2: am 8d319341: am 79749845: Merge "Fix pointer-to-int and int-to-pointer warnings."

* commit '52a442d26db65818da0664f96c0fa47ce56e446d':
  Fix pointer-to-int and int-to-pointer warnings.