Merge "Replace the use of native_handle_t by NativeHandle"