Pull in changes from master

Former-commit-id: a4c8f3836ed3533f1f313cedb4ed7293fbb2d95f

debian/control.REMOVED.git-id

@@ -1 +1 @@
-8e3f6a669696984745518b803d1a1e2fcc079e14
+8255e8ac9c2312e2297ede4a7fbe75073cb65f72

debian/mono-jay.docs

@@ -1,5 +0,0 @@
-debian/tmp/usr/share/jay/ACKNOWLEDGEMENTS
-debian/tmp/usr/share/jay/NEW_FEATURES
-debian/tmp/usr/share/jay/NOTES
-debian/tmp/usr/share/jay/README
-debian/tmp/usr/share/jay/README.jay

debian/mono-jay.install

@@ -1 +0,0 @@
-debian/tmp/usr/bin/jay

debian/mono-jay.manpages

@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/jay.1

debian/patches/llvm_llc_opt_default_path.patch

@@ -1,13 +1,13 @@
-Index: xamarin-pkg-mono/mono/mini/aot-compiler.c
-===================================================================
---- xamarin-pkg-mono.orig/mono/mini/aot-compiler.c
-+++ xamarin-pkg-mono/mono/mini/aot-compiler.c
-@@ -12744,7 +12744,7 @@ mono_compile_assembly (MonoAssembly *ass
- 	acfg->aot_opts.nftnptr_arg_trampolines = 128;
+diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
+index d75d3f934f2..885877869da 100644
+--- a/mono/mini/aot-compiler.c
++++ b/mono/mini/aot-compiler.c
+@@ -13279,7 +13279,7 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options,
  #endif
  	acfg->aot_opts.nunbox_arbitrary_trampolines = 256;
--	acfg->aot_opts.llvm_path = g_strdup ("");
-+	acfg->aot_opts.llvm_path = g_strdup ("/usr/lib/mono/llvm/bin/");
+ 	if (!acfg->aot_opts.llvm_path)
+-		acfg->aot_opts.llvm_path = g_strdup ("");
++		acfg->aot_opts.llvm_path = g_strdup ("/usr/lib/mono/llvm/bin/");
  	acfg->aot_opts.temp_path = g_strdup ("");
  #ifdef MONOTOUCH
  	acfg->aot_opts.use_trampolines_page = TRUE;

debian/rules

@@ -101,8 +101,7 @@ CONFIGURE =	CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"   \
 		  --disable-quiet-build \
 		  --disable-system-aot
 
-# Mono's build system doesn't like -j > 1
-MAKE_FLAGS += -j1
+MAKE_FLAGS += -j4
 export MAKEFLAGS=$(MAKE_FLAGS)
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))