[autoroll] Update angle -> android roller to use generic pre-upload step

Change-Id: Ic65de5257eea8cfa355a9d859e8fc4737b7ffefa
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/401218
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/autoroll/config/angle-android-master.cfg b/autoroll/config/angle-android-master.cfg
index d1d7bf4..ef090be 100644
--- a/autoroll/config/angle-android-master.cfg
+++ b/autoroll/config/angle-android-master.cfg
@@ -38,7 +38,12 @@
   parent_repo_url:  "https://android.googlesource.com/platform/external/angle/"
   parent_branch:  "master"
   child_rev_link_tmpl:  "https://chromium.googlesource.com/angle/angle.git/+/%s"
-  pre_upload_steps:  ANGLE_GN_TO_BP
+  pre_upload_commands:  {
+    command:  {
+      command: "./scripts/roll_aosp.sh"
+      cwd: "${parent_dir}/external/angle"
+    }
+  }
 }
 notifiers:  {
   log_level:  ERROR