am 5596240c: am 65e1c48d: Merge "Don\'t allow int<->pointer conversions."

* commit '5596240cc86920115cffbfe7aac66116d5136a0b':
  Don't allow int<->pointer conversions.