resolve merge conflicts of c1786d9 to nyc-mr2-dev-plus-aosp
am: 33f878e410  -s ours

Change-Id: I04c5449803f55d3e26bbc979d998db0802560f07
diff --git a/openbsd-reallocarray.c b/openbsd-reallocarray.c
index 41a3326..aa70686 100644
--- a/openbsd-reallocarray.c
+++ b/openbsd-reallocarray.c
@@ -19,7 +19,6 @@
 #include <errno.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <limits.h>
 
 /*
  * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX