Roll Clang for the Android port 163674:167488.

tools/clang/scripts/update.sh

 #!/usr/bin/env bash
 # Copyright (c) 2012 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.
 
 # This script will check out llvm and clang into third_party/llvm and build it.
 
 # Do NOT CHANGE this if you don't know what you're doing -- see
 # https://code.google.com/p/chromium/wiki/UpdatingClang
 # Reverting problematic clang rolls is safe, though.
-if [[ $ANDROID_SDK_VERSION || $PWD =~ [Aa]ndroid ]]; then
-  # Temporarily revert the last clang roll on android due to
-  # http://crbug.com/156947
-  CLANG_REVISION=163674
-else
-  CLANG_REVISION=167488
-fi
+CLANG_REVISION=167488
 
 THIS_DIR="$(dirname "${0}")"
 LLVM_DIR="${THIS_DIR}/../../../third_party/llvm"
 LLVM_BUILD_DIR="${LLVM_DIR}/../llvm-build"
 LLVM_BOOTSTRAP_DIR="${LLVM_DIR}/../llvm-bootstrap"
 CLANG_DIR="${LLVM_DIR}/tools/clang"
 COMPILER_RT_DIR="${LLVM_DIR}/projects/compiler-rt"
 ANDROID_NDK_DIR="${LLVM_DIR}/../android_tools/ndk"
 STAMP_FILE="${LLVM_BUILD_DIR}/cr_build_revision"
 
@@ skipping 296 matching lines @@
 if [[ -n "$run_tests" ]]; then
   # Run a few tests.
   "${PLUGIN_SRC_DIR}/tests/test.sh" "${LLVM_BUILD_DIR}/Release+Asserts"
   cd "${LLVM_BUILD_DIR}"
   make check-all
   cd -
 fi
 
 # After everything is done, log success for this revision.
 echo "${CLANG_REVISION}" > "${STAMP_FILE}"