Cleanup imports of mockito2 not to include bytebuddy.

This is a follow up from ag/2589347

Bug: 63999442
Test: None
Change-Id: I846c0a566c690d84edffe0ec792f7d270e40311e
diff --git a/v7/gridlayout/build.gradle b/v7/gridlayout/build.gradle
index 9ec6714..db85eda 100644
--- a/v7/gridlayout/build.gradle
+++ b/v7/gridlayout/build.gradle
@@ -4,12 +4,8 @@
     api project(':support-compat')
     api project(':support-core-ui')
 
-    androidTestImplementation (libs.test_runner) {
-        exclude module: 'support-annotations'
-    }
-    androidTestImplementation (libs.espresso_core) {
-        exclude module: 'support-annotations'
-    }
+    androidTestImplementation libs.test_runner,   { exclude module: 'support-annotations' }
+    androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
 }
 
 android {
@@ -20,8 +16,6 @@
     sourceSets {
         main.java.srcDir 'src'
         main.res.srcDir 'res'
-        main.assets.srcDir 'assets'
-        main.resources.srcDir 'src'
     }
 }