gapii/client: Use NativeBridgeABI().

May fix tracing Android applications on Chromebooks where the ABI translator cannot deal with libinterceptor.

gapii/client/adb.go

@@ -63,6 +63,10 @@ func StartOrAttach(ctx context.Context, p *android.InstalledPackage, a *android.
 	if abi.SameAs(device.UnknownABI) {
 		abi = p.Device.Instance().GetConfiguration().PreferredABI(nil)
 	}
+
+	// For NativeBridge emulated devices opt for the native ABI of the emulator.
+	abi = d.NativeBridgeABI(ctx, abi)
+
 	ctx = log.V{"abi": abi.Name}.Bind(ctx)
 
 	log.I(ctx, "Turning device screen on")

gapii/client/jdwp_loader.go

@@ -137,6 +137,11 @@ func (p *Process) loadAndConnectViaJDWP(
 		if abi == nil {
 			return nil, fmt.Errorf("Unknown ABI %v", abiName)
 		}
+
+		// For NativeBridge emulated devices opt for the native ABI of the
+		// emulator.
+		abi = d.NativeBridgeABI(ctx, abi)
+
 		return abi, nil
 	}