Merge pull request #1081 from Expensify/master

Update expensify_prod branch

libstuff/sqlite3.c

@@ -34447,12 +34447,6 @@ static int posixOpen(const char *zFile, int flags, int mode){
 static int openDirectory(const char*, int*);
 static int unixGetpagesize(void);
 
-// For experimenting with munmap and it's slow performance at shutdown.
-int munmapexp(void *addr, size_t length) {
-    // NOOP, skip the whole thing.
-    return 0;
-}
-
 /*
 ** Many system calls are accessed through pointer-to-functions so that
 ** they may be overridden at runtime to facilitate fault injection during
@@ -34579,7 +34573,7 @@ static struct unix_syscall {
 #define osMmap ((void*(*)(void*,size_t,int,int,int,off_t))aSyscall[22].pCurrent)
 
 #if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
-  { "munmap",       (sqlite3_syscall_ptr)munmapexp,       0 },
+  { "munmap",       (sqlite3_syscall_ptr)munmap,          0 },
 #else
   { "munmap",       (sqlite3_syscall_ptr)0,               0 },
 #endif