am 87b02f23: am 4e830641: am 1def25a2: Merge commit \'7ac60686\' into manualmerge

* commit '87b02f23c0996ab487ef15794bf862b3cd3e5137':
  Prevent integer overflow when allocating native_handle_t