Re-add nolib shrinkers

Change-Id: I750130fa7ed20cd79396a39566fdcb411e62c232
diff --git a/tools/as_utils.py b/tools/as_utils.py
index a5cc24d..7a6528a 100644
--- a/tools/as_utils.py
+++ b/tools/as_utils.py
@@ -10,7 +10,7 @@
 
 import utils
 
-def add_r8_dependency(checkout_dir, temp_dir):
+def add_r8_dependency(checkout_dir, temp_dir, minified):
   build_file = os.path.join(checkout_dir, 'build.gradle')
   assert os.path.isfile(build_file), (
       'Expected a file to be present at {}'.format(build_file))
@@ -36,7 +36,7 @@
         elif 'com.android.tools.build:gradle:' in stripped:
           gradle_version = stripped[stripped.rindex(':')+1:-1]
           indent = ''.ljust(line.index('classpath'))
-          jar = os.path.join(temp_dir, 'r8lib.jar')
+          jar = os.path.join(temp_dir, 'r8lib.jar' if minified else 'r8.jar')
           f.write('{}classpath files(\'{}\')\n'.format(indent, jar))
           added_r8_dependency = True
         elif stripped == '}':