Change CBD layout and texts

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index d6a6523fc6ba1407429b8fd0142b854f5544a21d..f9875c2b8b4c815476cb0628395f4efbf4756f35 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -450,7 +450,9 @@ android_library("chrome_test_java") {
     "//third_party/android_tools:legacy_http_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/custom_tabs_client:custom_tabs_support_java",
+    "//third_party/hamcrest:hamcrest_java",
     "//third_party/jsr-305:jsr_305_javalib",
+    "//third_party/junit",

[dullweber, 2017/03/14 12:33:36]

Hamcrest and junit are already indirect dependencies of
//base:base_java_test_support but I couldn't use static imports of assertThat()
or any of the hamcrest matchers like containsString() without these explicit
dependencies. Is it ok to add them here? 

The chrome_junit_tests use these assertions too but they only have the hamcrest
dependency. 

     "//ui/android:ui_java",
     "//ui/android:ui_javatests",
     google_play_services_library,