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

* commit '4e8306419073c93f07c7ac69955d990ffa315d96':
  Prevent integer overflow when allocating native_handle_t