Revert of Android: Refactor BuildInfo to use less jni and remove StrictMode exception

base/android/build_info.h

Index: base/android/build_info.h
diff --git a/base/android/build_info.h b/base/android/build_info.h
index 35ae730ef5f7ce47a46924ba4d6225710f77c414..e7dab563fb7688ae375426850f1d4fb63d09ab7a 100644
--- a/base/android/build_info.h
+++ b/base/android/build_info.h
@@ -8,7 +8,6 @@
 #include <jni.h>
 
 #include <string>
-#include <vector>
 
 #include "base/base_export.h"
 #include "base/macros.h"
@@ -117,27 +116,27 @@
  private:
   friend struct BuildInfoSingletonTraits;
 
-  explicit BuildInfo(const std::vector<std::string>& params);
+  explicit BuildInfo(JNIEnv* env);
 
   // Const char* is used instead of std::strings because these values must be
   // available even if the process is in a crash state. Sadly
   // std::string.c_str() doesn't guarantee that memory won't be allocated when
   // it is called.
-  const char* const brand_;
   const char* const device_;
-  const char* const android_build_id_;
   const char* const manufacturer_;
   const char* const model_;
-  const int sdk_int_;
-  const char* const build_type_;
+  const char* const brand_;
+  const char* const android_build_id_;
+  const char* const android_build_fp_;
+  const char* const gms_version_code_;
+  const char* const package_version_code_;
+  const char* const package_version_name_;
   const char* const package_label_;
   const char* const package_name_;
-  const char* const package_version_code_;
-  const char* const package_version_name_;
-  const char* const android_build_fp_;
-  const char* const gms_version_code_;
+  const char* const build_type_;
   // Not needed by breakpad.
   const std::string extracted_file_suffix_;
+  const int sdk_int_;
   // This is set via set_java_exception_info, not at constructor time.
   const char* java_exception_info_;