Fix test failures from internal presubmit (#2507)

* Change bundle protos package

* Fix g3 test failures
1. Use proper executor service for spec tests.
2. Skip @hide annotated Task interface.

Author: wu-hui

firebase-firestore/src/test/java/com/google/firebase/firestore/LoadBundleTaskTest.java

@@ -61,7 +61,20 @@ public class LoadBundleTaskTest {
 
   @Test
   public void testImplementsAllTaskInterface() {
+    // Check if the internal gms Hide annotation is accessible.
+    Class hideClazz = null;
+    try {
+      hideClazz = Class.forName("com.google.android.gms.common.internal.Hide");
+    } catch (ClassNotFoundException e) {
+      // Swallow the exception.
+    }
+
     for (Method method : Task.class.getDeclaredMethods()) {
+      // This method is annotated with @Hide, skipping.
+      if (hideClazz != null && method.getAnnotation(hideClazz) != null) {
+        continue;
+      }
+
       try {
         LoadBundleTask.class.getDeclaredMethod(method.getName(), method.getParameterTypes());
       } catch (NoSuchMethodException e) {

firebase-firestore/src/test/java/com/google/firebase/firestore/spec/SpecTestCase.java

@@ -97,6 +97,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ExecutorService;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -106,7 +107,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
-import org.robolectric.android.util.concurrent.RoboExecutorService;
+import org.robolectric.android.util.concurrent.InlineExecutorService;
 
 /**
  * Subclasses of SpecTestCase run a set of portable event specifications from JSON spec files
@@ -222,7 +223,7 @@ public abstract class SpecTestCase implements RemoteStoreCallback {
   private int snapshotsInSyncEvents = 0;
 
   /** An executor to use for test callbacks. */
-  private final RoboExecutorService backgroundExecutor = new RoboExecutorService();
+  private final ExecutorService backgroundExecutor = new InlineExecutorService();
 
   /** The current user for the SyncEngine. Determines which mutation queue is active. */
   private User currentUser;