Revert "Add more unbundle packages to sysroots"

This reverts commit b828d53c.

Reason for revert: Causing a build failure on Google Chrome Linux x64
https://ci.chromium.org/buildbot/chromium.chrome/Google%20Chrome%20Linux%20x64/29741

/b/c/b/Google_Chrome_Linux_x64/src/out/Release/../../third_party/llvm-build/Release+Asserts/bin/ld.lld: error: duplicate symbol: exp2f@GLIBC_2.2.5
>>> defined in obj/third_party/swiftshader/src/OpenGL/compiler/swiftshader_opengl_compiler/Intermediate.o
>>> defined in obj/third_party/swiftshader/src/Renderer/swiftshader_renderer/Context.o
/b/c/b/Google_Chrome_Linux_x64/src/out/Release/../../third_party/llvm-build/Release+Asserts/bin/ld.lld: error: duplicate symbol: exp2f@GLIBC_2.2.5
>>> defined in obj/third_party/swiftshader/src/OpenGL/compiler/swiftshader_opengl_compiler/Intermediate.o
>>> defined in obj/third_party/swiftshader/src/Renderer/swiftshader_renderer/Sampler.o
/b/c/b/Google_Chrome_Linux_x64/src/out/Release/../../third_party/llvm-build/Release+Asserts/bin/ld.lld: error: duplicate symbol: powf@GLIBC_2.2.5
>>> defined in obj/third_party/swiftshader/src/Renderer/swiftshader_renderer/Surface.o
>>> defined in obj/third_party/swiftshader/src/Shader/swiftshader_shader/Constants.o
/b/c/b/Google_Chrome_Linux_x64/src/out/Release/../../third_party/llvm-build/Release+Asserts/bin/ld.lld: error: duplicate symbol: powf@GLIBC_2.2.5
>>> defined in obj/third_party/swiftshader/src/Renderer/swiftshader_renderer/Surface.o
>>> defined in obj/third_party/swiftshader/src/Common/swiftshader_common/Math.o

Original change's description:
> Add more unbundle packages to sysroots
> 
> The new packages are necessary to test unbundling of flac, libxslt, and zlib.
> 
> BUG=800977
> R=​thestig
> TBR=mark
> 
> Change-Id: I2c5f88b3819ce000e906cf303fdffa30bdde84cb
> Reviewed-on: https://chromium-review.googlesource.com/981451
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Reviewed-by: Lei Zhang <thestig@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#549303}

TBR=thakis@chromium.org,thestig@chromium.org,thomasanderson@chromium.org,mark@chromium.org

Change-Id: I90188d22140d7cdd60f8bbea5b0e88705e498988
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 800977
Reviewed-on: https://chromium-review.googlesource.com/1003532Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549314}

build/linux/sysroot_scripts/sysroot-creator-sid.sh

@@ -100,7 +100,6 @@ DEBIAN_PACKAGES="\
   libfontconfig1-dev
   libfreetype6
   libfreetype6-dev
-  libfribidi0
   libgbm-dev
   libgbm1
   libgcc-6-dev
@@ -169,8 +168,6 @@ DEBIAN_PACKAGES="\
   liblz4-1
   liblzma5
   liblzo2-2
-  libminizip-dev
-  libminizip1
   libmount1
   libnettle6
   libnspr4
@@ -178,7 +175,6 @@ DEBIAN_PACKAGES="\
   libnss-db
   libnss3
   libnss3-dev
-  libogg-dev
   libogg0
   libopengl0
   libopus-dev
@@ -210,7 +206,7 @@ DEBIAN_PACKAGES="\
   libpulse-dev
   libpulse-mainloop-glib0
   libpulse0
-  libre2-4
+  libre2-3
   libre2-dev
   librest-0.7-0
   libselinux1
@@ -295,7 +291,6 @@ DEBIAN_PACKAGES="\
   libxkbcommon-dev
   libxkbcommon0
   libxml2
-  libxml2-dev
   libxrandr-dev
   libxrandr2
   libxrender-dev
@@ -316,8 +311,8 @@ DEBIAN_PACKAGES="\
   uuid-dev
   wayland-protocols
   x11proto-composite-dev
+  x11proto-core-dev
   x11proto-damage-dev
-  x11proto-dev
   x11proto-fixes-dev
   x11proto-input-dev
   x11proto-kb-dev

build/linux/sysroot_scripts/sysroot-creator.sh

@@ -315,13 +315,6 @@ HacksAndPatchesCommon() {
   nm -D --defined-only --with-symbol-versions "${libm_so}" | \
     "${SCRIPT_DIR}/find_incompatible_glibc_symbols.py" >> "${math_h}"
 
-  # glob64() was also optimized in glibc 2.27.  Make sure to choose the older
-  # version.
-  local glob_h="${INSTALL_ROOT}/usr/include/glob.h"
-  local libc_so="${INSTALL_ROOT}/lib/${arch}-${os}/libc.so.6"
-  nm -D --defined-only --with-symbol-versions "${libc_so}" | \
-    "${SCRIPT_DIR}/find_incompatible_glibc_symbols.py" >> "${glob_h}"
-
   # This is for chrome's ./build/linux/pkg-config-wrapper
   # which overwrites PKG_CONFIG_LIBDIR internally
   SubBanner "Move pkgconfig scripts"

build/linux/sysroot_scripts/sysroots.json

 {
     "sid_amd64": {
-        "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
-        "Sha1Sum": "4e7db513b0faeea8fb410f70c9909e8736f5c0ab",
+        "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
+        "Sha1Sum": "85ac8d5e0f6cff99fc323fd3d29cb73e2aa970e2",
         "SysrootDir": "debian_sid_amd64-sysroot",
         "Tarball": "debian_sid_amd64_sysroot.tar.xz"
     },
     "sid_arm": {
-        "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
-        "Sha1Sum": "b2165ab47ab9c4cc780db53ace1b08607d68ae31",
+        "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
+        "Sha1Sum": "ed31924757f11885a21793dc4b928d07ab25740c",
         "SysrootDir": "debian_sid_arm-sysroot",
         "Tarball": "debian_sid_arm_sysroot.tar.xz"
     },
     "sid_arm64": {
-        "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
-        "Sha1Sum": "37dfa5f22e2c0e847cee34f9848eb31230c33d35",
+        "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
+        "Sha1Sum": "b9447285e58c5260bd9fa2737d1f0d1f82156738",
         "SysrootDir": "debian_sid_arm64-sysroot",
         "Tarball": "debian_sid_arm64_sysroot.tar.xz"
     },
     "sid_i386": {
-        "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
-        "Sha1Sum": "b8639749e2b561a7462d7e7978ca74ee4044bdab",
+        "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
+        "Sha1Sum": "f09856d93f39e8df84ffd9c04881f44e6cbc0508",
         "SysrootDir": "debian_sid_i386-sysroot",
         "Tarball": "debian_sid_i386_sysroot.tar.xz"
     },
     "sid_mips": {
-        "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
-        "Sha1Sum": "baaf37cdcbcf251fb9a4ccaf8b479722ae61fe49",
+        "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
+        "Sha1Sum": "90586b566b567b2bcf49e7fd112f0c8189bbd07b",
         "SysrootDir": "debian_sid_mips-sysroot",
         "Tarball": "debian_sid_mips_sysroot.tar.xz"
     },
     "sid_mips64el": {
-        "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
-        "Sha1Sum": "bbfe1a513b849921cfcf78865faec8fc03f93b3d",
+        "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
+        "Sha1Sum": "f90c3b81485ffebb283afddb1a72bc61e14c593d",
         "SysrootDir": "debian_sid_mips64el-sysroot",
         "Tarball": "debian_sid_mips64el_sysroot.tar.xz"
     }

third_party/crashpad/crashpad/compat/linux/sys/ptrace.h

@@ -20,8 +20,7 @@
 #include <sys/cdefs.h>
 
 // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
-#if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
-    defined(__GLIBC__)
+#if !defined(PTRACE_GET_THREAD_AREA) && defined(__GLIBC__)
 #if defined(__i386__) || defined(__x86_64__)
 static constexpr __ptrace_request PTRACE_GET_THREAD_AREA =
     static_cast<__ptrace_request>(25);
@@ -31,7 +30,7 @@ static constexpr __ptrace_request PTRACE_GET_THREAD_AREA =
     static_cast<__ptrace_request>(22);
 #define PTRACE_GET_THREAD_AREA PTRACE_GET_THREAD_AREA
 #endif
-#endif  // !PTRACE_GET_THREAD_AREA && !PT_GET_THREAD_AREA && defined(__GLIBC__)
+#endif  // !PTRACE_GET_THREAD_AREA && defined(__GLIBC__)
 
 // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
 #if !defined(PTRACE_GETVFPREGS) && \