Revert of build: Prepare for building clang without ENABLE_LINKER_BUILD_ID=ON

build/config/android/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 
 assert(is_android)
 
 # This is included by reference in the //build/config/compiler config that
@@ skipping 21 matching lines @@
         # Have to force IAS for mips64.
         "-fintegrated-as",
       ]
     }
   } else {
     # Clang doesn't support these flags.
     cflags += [ "-finline-limit=64" ]
   }
 
   ldflags = [
+    "-Wl,--build-id=sha1",
     "-Wl,--no-undefined",
 
     # Don't allow visible symbols from libgcc or libc++ to be
     # re-exported.
     "-Wl,--exclude-libs=libgcc.a",
     "-Wl,--exclude-libs=libc++_static.a",
 
     # Don't allow visible symbols from libraries that contain
     # assembly code with symbols that aren't hidden properly.
     # http://crbug.com/448386
@@ skipping 176 matching lines @@
 
       # Avoid errors with current NDK:
       # "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:3426:3: error: argument must be a constant"
       "-finstrument-functions-exclude-file-list=arm_neon.h",
     ]
   }
 }
 
 config("no_cygprofile_instrumentation") {
 }