Configure @androidsdk//:emulator_x86 and :emulator_arm to point to th…

…e unified emulator binary

Fixes #8280

Closes #8282.

Change-Id: If21e2119b0c9baef245412b0e5a0bdcfe270892e
PiperOrigin-RevId: 247489886

src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt

@@ -23,14 +23,16 @@ alias(
     actual = "emulator/emulator",
 )
 
+# emulator v29+ removed the arm and x86 specific binaries.
+# Keeping these aliases around for backwards compatibility.
 alias(
     name = "emulator_arm",
-    actual = "emulator/emulator64-arm",
+    actual = "emulator/emulator",
 )
 
 alias(
     name = "emulator_x86",
-    actual = "emulator/emulator64-x86",
+    actual = "emulator/emulator",
 )
 
 filegroup(