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

* commit '7f5c8181492de0f317551d35a4485f08c6d5c48a':
  Prevent integer overflow when allocating native_handle_t