Merge 1:4.0.1-10~deb9u2 and 1:4.0.1-10+rpi1 to produce 1:4.0.1-10~deb9u2+rpi1

diff --cc debian/changelog
index f9cde034aad1b84952ae72dde9e61c88c5cb456d,9889f7a70cb7dd59f31507559eeba0932a701ae1..00cda985735373dcd0395e0db740ac7d271962a2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,23 +1,37 @@@
 -llvm-toolchain-4.0 (1:4.0.1-10+rpi1) buster-staging; urgency=medium
++llvm-toolchain-4.0 (1:4.0.1-10~deb9u2+rpi1) stretch-staging; urgency=medium
+ 
+   [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 14 May 2016 21:43:35 +0000]
+   * Cleanup .pyc files in clean target.
+   * Add a hack to the cmake based build to force armv6 (unfortunately the cmake
+     based build relies on config.guess which assumes you want to build for the
+     hardware you are running on).
+   * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that
+     are broken on lower arm architectures.
+ 
+   [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green]
+   * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously).
+   * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake
+   * Clean up debian/usr in clean target.
+   * Clean up clang/tools/*-3.9 in clean target.
+   * Clean up stray *3.9.vim files
+   * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc
+   * Clean up debian/*.install
+ 
 - -- Raspbian forward porter <root@raspbian.org>  Wed, 21 Feb 2018 07:19:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 16 Aug 2018 12:04:53 +0000
++
 +llvm-toolchain-4.0 (1:4.0.1-10~deb9u2) stretch; urgency=medium
 +
 +  * Don't link with gold on s390x, not available in stretch.
 +
 + -- Julien Cristau <jcristau@mozilla.com>  Mon, 02 Jul 2018 10:45:18 +0200
 +
 +llvm-toolchain-4.0 (1:4.0.1-10~deb9u1) stretch; urgency=medium
 +
 +  * Build for stretch-security to be used by Firefox ESR60
 +  * Add Build-Conflicts: to golang-go (prevents build failure similar
 +    to #840208)
 +
 + -- Moritz Mühlenhoff <jmm@debian.org>  Tue, 15 May 2018 00:07:58 +0200
  
  llvm-toolchain-4.0 (1:4.0.1-10) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge