Reland roll android_tools and breakpad to the latest.

base/sys_info_android.cc

 // 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.
 
 #include "base/sys_info.h"
 
 #include <dlfcn.h>
 #include <sys/system_properties.h>
 
 #include "base/android/sys_utils.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info_internal.h"
 
-// TODO(rmcilroy): Update API level when 'L' gets an official API level.
-#if (__ANDROID_API__ >= 9999 /* 'L' */)
+#if (__ANDROID_API__ >= 21 /* 5.0 - Lollipop */)
 
 namespace {
 
 typedef int (SystemPropertyGetFunction)(const char*, char*);
 
 SystemPropertyGetFunction* DynamicallyLoadRealSystemPropertyGet() {
   // libc.so should already be open, get a handle to it.
   void* handle = dlopen("libc.so", RTLD_NOLOAD);
   if (!handle) {
     LOG(FATAL) << "Cannot dlopen libc.so: " << dlerror();
@@ skipping 180 matching lines @@
     base::internal::LazySysInfoValue<bool,
         android::SysUtils::IsLowEndDeviceFromJni> >::Leaky
     g_lazy_low_end_device = LAZY_INSTANCE_INITIALIZER;
 
 bool SysInfo::IsLowEndDevice() {
   return g_lazy_low_end_device.Get().value();
 }
 
 
 }  // namespace base