Merge changes Ia7e7fb61,Iede67e2c

* changes:
  androidmk: Fix LOCAL_FORCE_STATIC_EXECUTABLE
  Implement re-exporting of library headers
diff --git a/cc/x86_darwin_host.go b/cc/x86_darwin_host.go
index 987b1dd..65a2dcc 100644
--- a/cc/x86_darwin_host.go
+++ b/cc/x86_darwin_host.go
@@ -89,6 +89,7 @@
 		"c",
 		"m",
 		"pthread",
+		"z",
 	}, "-l")
 )