add command line cpu info to allow android neon test

unit_test/scale_argb_test.cc

Index: unit_test/scale_argb_test.cc
diff --git a/unit_test/scale_argb_test.cc b/unit_test/scale_argb_test.cc
index ca928cf374c7dbea9343fcaa23b4263c8815c957..cbf9cb72a064727fe8aef8a16703bba82e85dcd6 100644
--- a/unit_test/scale_argb_test.cc
+++ b/unit_test/scale_argb_test.cc
@@ -25,7 +25,7 @@ namespace libyuv {
 static int ARGBTestFilter(int src_width, int src_height,
                           int dst_width, int dst_height,
                           FilterMode f, int benchmark_iterations,
-                          int disable_cpu_flags) {
+                          int disable_cpu_flags, int benchmark_cpu_info) {
   int i, j;
   const int b = 0;  // 128 to test for padding/stride.
   int64 src_argb_plane_size = (Abs(src_width) + b * 2) *
@@ -57,7 +57,7 @@ static int ARGBTestFilter(int src_width, int src_height,
             src_width, src_height,
             dst_argb_c + (dst_stride_argb * b) + b * 4, dst_stride_argb,
             dst_width, dst_height, f);
-  MaskCpuFlags(-1);  // Enable all CPU optimization.
+  MaskCpuFlags(benchmark_cpu_info);  // Enable all CPU optimization.
   ARGBScale(src_argb + (src_stride_argb * b) + b * 4, src_stride_argb,
             src_width, src_height,
             dst_argb_opt + (dst_stride_argb * b) + b * 4, dst_stride_argb,
@@ -72,7 +72,7 @@ static int ARGBTestFilter(int src_width, int src_height,
 
   c_time = (get_time() - c_time);
 
-  MaskCpuFlags(-1);  // Enable all CPU optimization.
+  MaskCpuFlags(benchmark_cpu_info);  // Enable all CPU optimization.
   double opt_time = get_time();
   for (i = 0; i < benchmark_iterations; ++i) {
     ARGBScale(src_argb + (src_stride_argb * b) + b * 4, src_stride_argb,
@@ -224,7 +224,7 @@ static int ARGBClipTestFilter(int src_width, int src_height,
                                 DX(benchmark_width_, nom, denom),              \
                                 DX(benchmark_height_, nom, denom),             \
                                 kFilter##filter, benchmark_iterations_,        \
-                                disable_cpu_flags_);                           \
+                                disable_cpu_flags_, benchmark_cpu_info_);      \
       EXPECT_LE(diff, max_diff);                                               \
     }                                                                          \
     TEST_F(LibYUVScaleTest, ARGBScaleDownClipBy##name##_##filter) {            \
@@ -260,14 +260,14 @@ TEST_FACTOR(3, 1, 3)
       int diff = ARGBTestFilter(benchmark_width_, benchmark_height_,           \
                                 width, height,                                 \
                                 kFilter##filter, benchmark_iterations_,        \
-                                disable_cpu_flags_);                           \
+                                disable_cpu_flags_, benchmark_cpu_info_);      \
       EXPECT_LE(diff, max_diff);                                               \
     }                                                                          \
     TEST_F(LibYUVScaleTest, name##From##width##x##height##_##filter) {         \
       int diff = ARGBTestFilter(width, height,                                 \
                                 Abs(benchmark_width_), Abs(benchmark_height_), \
                                 kFilter##filter, benchmark_iterations_,        \
-                                disable_cpu_flags_);                           \
+                                disable_cpu_flags_, benchmark_cpu_info_);      \
       EXPECT_LE(diff, max_diff);                                               \
     }                                                                          \
     TEST_F(LibYUVScaleTest, name##ClipTo##width##x##height##_##filter) {       \