supersize: A few fixes for Android+clang builds

tools/binary_size/libsupersize/testdata/Console.golden

Index: tools/binary_size/libsupersize/testdata/Console.golden
diff --git a/tools/binary_size/libsupersize/testdata/Console.golden b/tools/binary_size/libsupersize/testdata/Console.golden
index 881e6d9b9aaa9f4e67d66c2845fa6e4fc494589b..c8a3151291a14c52f7333f94b35a38c02e9976a9 100644
--- a/tools/binary_size/libsupersize/testdata/Console.golden
+++ b/tools/binary_size/libsupersize/testdata/Console.golden
@@ -64,7 +64,7 @@ Section Sizes (Total=41.8mb (43785380 bytes)):
     .rodata: 5.65mb (5927652 bytes) (13.5%)
     .text: 34.2mb (35900712 bytes) (82.0%)
 
-Showing 48 symbols (45 unique) with total pss: 43785380 bytes
+Showing 49 symbols (46 unique) with total pss: 43785380 bytes
 .text=34.2mb     .rodata=5.65mb     .data*=1.87mb     .bss=512kb      total=41.8mb
 Number of object files: 10
 
@@ -106,62 +106,64 @@ Index, Running Total, Section@Address, PSS
              blink::PaintChunker::releasePaintChunks [clone .part.1]
 17)  35900712 (82.0%) t@0x24ca628  35821002 {no path}
              ** symbol gap 2 (end of section)
-18)  37866121 (86.5%) r@0x266e600  1965409 {no path}
+18)  37862696 (86.5%) r@0x266e600  1961984 {no path}
              ** merge strings
-19)  37866124 (86.5%) r@0x284e364  3       {no path}
+19)  37866121 (86.5%) r@0x284d600  3425    {no path}
+             ** merge constants
+20)  37866124 (86.5%) r@0x284e364  3       {no path}
              ** symbol gap 2
-20)  37866132 (86.5%) r@0x284e364  8       base/page_allocator.cc
-21)  37866176 (86.5%) r@0x284e370  44      base/page_allocator.cc
+21)  37866132 (86.5%) r@0x284e364  8       base/page_allocator.cc
+22)  37866176 (86.5%) r@0x284e370  44      base/page_allocator.cc
              Name
-22)  37866208 (86.5%) r@0x284e398  32      third_party/container.c
+23)  37866208 (86.5%) r@0x284e398  32      third_party/container.c
              chrome::mojom::FilePatcher::Name_
-23)  38542193 (88.0%) r@0x284e518  675985  {no path}
+24)  38542193 (88.0%) r@0x284e518  675985  {no path}
              ** merge strings
-24)  38542248 (88.0%) r@0x28f3450  55      third_party/paint.cc
+25)  38542248 (88.0%) r@0x28f3450  55      third_party/paint.cc
              kAnimationFrameTimeHistogramClassPath
-25)  38542252 (88.0%) r@0x28f3480  4       third_party/paint.cc
+26)  38542252 (88.0%) r@0x28f3480  4       third_party/paint.cc
              blink::CSSValueKeywordsHash::findValueImpl::value_word_list
-26)  41828364 (95.5%) r@0x2c158e4  3286112 {no path}
+27)  41828364 (95.5%) r@0x2c158e4  3286112 {no path}
              ** symbol gap 3 (end of section)
-27)  41828420 (95.5%) d@0x2c176f0  56      third_party/icu/ucnv_ext.c
+28)  41828420 (95.5%) d@0x2c176f0  56      third_party/icu/ucnv_ext.c
              ChromeMainDelegate [vtable]
-28)  41828444 (95.5%) d@0x2c17728  24      third_party/icu/ucnv_ext.c
+29)  41828444 (95.5%) d@0x2c17728  24      third_party/icu/ucnv_ext.c
              chrome::mojom::FieldTrialRecorder [vtable]
-29)  42618348 (97.3%) d@0x2c17740  789904  third_party/container.c
+30)  42618348 (97.3%) d@0x2c17740  789904  third_party/container.c
              chrome::mojom::FieldTrialRecorderProxy [vtable]
-30)  42618380 (97.3%) d@0x2cd84e0  32      third_party/gvr-android-sdk/libgvr_shim_static_arm.a/libcontroller_api_impl.a_controller_api_impl.o
+31)  42618380 (97.3%) d@0x2cd84e0  32      third_party/gvr-android-sdk/libgvr_shim_static_arm.a/libcontroller_api_impl.a_controller_api_impl.o
              .Lswitch.table.45
-31)  42618388 (97.3%) d@0x2cd84f0  8       third_party/gvr-android-sdk/libgvr_shim_static_arm.a/libport_android_jni.a_jni_utils.o
+32)  42618388 (97.3%) d@0x2cd84f0  8       third_party/gvr-android-sdk/libgvr_shim_static_arm.a/libport_android_jni.a_jni_utils.o
              kSystemClassPrefixes
-32)  42618444 (97.3%) d@0x2cd8500  56      third_party/paint.cc
+33)  42618444 (97.3%) d@0x2cd8500  56      third_party/paint.cc
              ChromeMainDelegateAndroid [vtable]
-33)  42618468 (97.3%) d@0x2cd8538  24      base/page_allocator.cc
+34)  42618468 (97.3%) d@0x2cd8538  24      base/page_allocator.cc
              mojo::MessageReceiver [vtable]
-34)  42618480 (97.3%) d@0x2cd8550  12      base/page_allocator.cc
+35)  42618480 (97.3%) d@0x2cd8550  12      base/page_allocator.cc
              kMethodsAnimationFrameTimeHistogram
-35)  43683612 (99.8%) d@0x2ddc608  1065132 {no path}
+36)  43683612 (99.8%) d@0x2ddc608  1065132 {no path}
              ** symbol gap 3 (end of section)
-36)  43683616 (99.8%) d@0x2de7000  4       base/page_allocator.cc
+37)  43683616 (99.8%) d@0x2de7000  4       base/page_allocator.cc
              google::protobuf::internal::pLinuxKernelCmpxchg
-37)  43683620 (99.8%) d@0x2de7004  4       third_party/container.c
+38)  43683620 (99.8%) d@0x2de7004  4       third_party/container.c
              google::protobuf::internal::pLinuxKernelMemoryBarrier
-38)  43683772 (99.8%) d@0x2de7008  152     third_party/container.c
+39)  43683772 (99.8%) d@0x2de7008  152     third_party/container.c
              base::android::kBaseRegisteredMethods
-39)  43683776 (99.8%) d@0x2de70a0  4       third_party/container.c
+40)  43683776 (99.8%) d@0x2de70a0  4       third_party/container.c
              base::android::g_renderer_histogram_code
-40)  43683780 (99.8%) d@0x2de70a4  4       third_party/container.c
+41)  43683780 (99.8%) d@0x2de70a4  4       third_party/container.c
              base::android::g_library_version_number
-41)  43785380 (100.0%) d@0x2dffd88  101600  {no path}
+42)  43785380 (100.0%) d@0x2dffd88  101600  {no path}
              ** symbol gap 3 (end of section)
-42)  43785380 (100.0%) b@0x0        262144  third_party/fft_float.cc
+43)  43785380 (100.0%) b@0x0        262144  third_party/fft_float.cc
              ff_cos_131072
-43)  43785380 (100.0%) b@0x0        131072  third_party/fft_fixed.cc
+44)  43785380 (100.0%) b@0x0        131072  third_party/fft_fixed.cc
              ff_cos_131072_fixed
-44)  43785380 (100.0%) b@0x0        131072  third_party/fft_float.cc
+45)  43785380 (100.0%) b@0x0        131072  third_party/fft_float.cc
              ff_cos_65536
-45)  43785380 (100.0%) b@0x2dffda0  28      third_party/icu/ucnv_ext.c
+46)  43785380 (100.0%) b@0x2dffda0  28      third_party/icu/ucnv_ext.c
              g_chrome_content_browser_client
-46)  43785380 (100.0%) b@0x2dffe80  200     third_party/icu/ucnv_ext.c
+47)  43785380 (100.0%) b@0x2dffe80  200     third_party/icu/ucnv_ext.c
              SaveHistogram::atomic_histogram_pointer
-47)  43785380 (100.0%) b@0x2dffe84  4       third_party/icu/ucnv_ext.c
+48)  43785380 (100.0%) b@0x2dffe84  4       third_party/icu/ucnv_ext.c
              g_AnimationFrameTimeHistogram_clazz