[Android] Cleanup special case for old protobuf runtime targetname

A special case rename was added previously because of a rollback of the
protobuf runtime. The protobuf runtime has since been rolled forward and
thus the special case in BuildConfigGenerator.groovy is no longer needed.

Change-Id: Idb392d0fe1aca25e365ae4f53e14e71ba85cbddd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2323588
Auto-Submit: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792293}

third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy

@@ -245,13 +245,6 @@ class BuildConfigGenerator extends DefaultTask {
         if (isPlayServicesTarget(targetName)) {
             return targetName.replaceFirst("com_", "").replaceFirst("android_gms_", "")
         }
-        // To avoid stale depfile issues, rename this. (due to recently removed
-        // alias from lite to javalite and the recently added alias from
-        // javalite to lite, causing a dep cycle because stale depfiles).
-        // Todo(mheikal): remove this after crbug.com/1093059 .
-        if (targetName.equals("com_google_protobuf_protobuf_lite")) {
-          return "com_google_protobuf_protobuf_lite_cr1"
-        }
         return targetName
     }