Merge remote-tracking branch 'refs/remotes/facebook/dev' into gz_compress

# Conflicts:
#	programs/Makefile

diff --cc programs/Makefile
index c960296313d2ac01a44050c0178b5c425c0180ce,862ba35dd8b5cd259cd0e53f627c32809fc6b395..efe6844324540a0a7fb0ab4870cfd4f898fcd3a1
--- 1/programs/Makefile
--- 2/programs/Makefile
+++ b/programs/Makefile
@@@ -67,12 -67,10 +67,10 @@@ endi
  
  # zlib detection
  VOID = /dev/null
- HAVE_ZLIB := $(shell echo -e "\#include <zlib.h>\nint main(){}" | $(CC) -o have_zlib -x c - -lz 2> $(VOID) && echo 1 || echo 0)
+ HAVE_ZLIB := $(shell printf '\#include <zlib.h>\nint main(){}' | $(CC) -o have_zlib -x c - -lz 2> $(VOID) && echo 1 || echo 0)
  ifeq ($(HAVE_ZLIB), 1)
  TEMP := $(shell rm have_zlib$(EXT))
- endif
- ifeq ($(HAVE_ZLIB), 1)
 -ZLIBCPP = -DZSTD_GZDECOMPRESS
 +ZLIBCPP = -DZSTD_GZCOMPRESS -DZSTD_GZDECOMPRESS
  ZLIBLD = -lz
  endif