Rebuild sysroots again

The previous rebuild only updated libraries in /lib/x86_64-linux-gnu,
however, /usr/lib/x86_64-linux-gnu needs to be updated too.

BUG=1086636
R=thestig
CC=thakis

Change-Id: I3ec3dac90ee7c145f361b5af7705953b7834d5fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2225743
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773882}

build/linux/sysroot_scripts/sysroot-creator.sh

@@ -341,7 +341,8 @@ HacksAndPatchesCommon() {
   # DT_NEEDED entries from libdbus-1.so.3 to a different string. LLD will
   # suppress --no-allow-shlib-undefined diagnostics for such shared objects.
   set +e
-  for f in "${INSTALL_ROOT}/lib/${arch}-${os}"/*.so; do
+  for f in "${INSTALL_ROOT}/lib/${arch}-${os}"/*.so \
+           "${INSTALL_ROOT}/usr/lib/${arch}-${os}"/*.so; do
     echo "$f" | grep -q 'libdbus-1.so$' && continue
     # In a dependent shared object, the only occurrence of "libdbus-1.so.3" is
     # the string referenced by the DT_NEEDED entry.
@@ -514,6 +515,8 @@ VerifyLibraryDepsCommon() {
       grep ': ELF' | sed 's/^\(.*\): .*$/\1/' | xargs readelf -d | \
       grep NEEDED | sort | uniq | sed 's/^.*Shared library: \[\(.*\)\]$/\1/g')"
   local all_libs="$(find ${find_dirs[*]} -printf '%f\n')"
+  # Ignore missing libdbus-1.so.0
+  all_libs+="$(echo -e '\nlibdbus-1.so.0')"
   local missing_libs="$(grep -vFxf <(echo "${all_libs}") \
     <(echo "${needed_libs}"))"
   if [ ! -z "${missing_libs}" ]; then

build/linux/sysroot_scripts/sysroots.json

 {
     "sid_amd64": {
-        "Sha1Sum": "7cb8859908b62740c7ea8b6f6c9c42d0408d6487",
+        "Sha1Sum": "d6879d611f3dcf3da8dd92e080029394aa30bc42",
         "SysrootDir": "debian_sid_amd64-sysroot",
         "Tarball": "debian_sid_amd64_sysroot.tar.xz"
     },
     "sid_arm": {
-        "Sha1Sum": "3191c5db7bcf3ce4c8b96b004f6d8192e55a36b8",
+        "Sha1Sum": "b7688b64ce3a5b93db21678d1c88cf35da340a39",
         "SysrootDir": "debian_sid_arm-sysroot",
         "Tarball": "debian_sid_arm_sysroot.tar.xz"
     },
     "sid_arm64": {
-        "Sha1Sum": "1661191b78884f3c53983806a5b3e19d1b5f37f7",
+        "Sha1Sum": "96072272c5c3dc906fdce0517368b8a298af7abd",
         "SysrootDir": "debian_sid_arm64-sysroot",
         "Tarball": "debian_sid_arm64_sysroot.tar.xz"
     },
     "sid_armel": {
-        "Sha1Sum": "648efa9005dee11cb288e878727eb392e35cff92",
+        "Sha1Sum": "220a382df2a9af90328e70cdef598b298781ad27",
         "SysrootDir": "debian_sid_armel-sysroot",
         "Tarball": "debian_sid_armel_sysroot.tar.xz"
     },
     "sid_i386": {
-        "Sha1Sum": "3aa54a1239f7093903018f291f80e0d24216eb5d",
+        "Sha1Sum": "9c31dbb40e1af6ce03336a095ba6ad6e0c961e77",
         "SysrootDir": "debian_sid_i386-sysroot",
         "Tarball": "debian_sid_i386_sysroot.tar.xz"
     },
     "sid_mips": {
-        "Sha1Sum": "f4b7f749bd5d798748d6958b7b7bcbeac8f9040c",
+        "Sha1Sum": "728755d2fb5455d1d3293b6b10704fca859d97dd",
         "SysrootDir": "debian_sid_mips-sysroot",
         "Tarball": "debian_sid_mips_sysroot.tar.xz"
     },
     "sid_mips64el": {
-        "Sha1Sum": "3493e00ebbe5a4b735341368add23cf4041590d9",
+        "Sha1Sum": "e9e309d7887cb9baacb3aac603fd50f476891ead",
         "SysrootDir": "debian_sid_mips64el-sysroot",
         "Tarball": "debian_sid_mips64el_sysroot.tar.xz"
     }