Fix C compatibility in new API.

I fixed all these in AOSP, but this API isn't in AOSP yet and is also
missing the typedef needed for C compat.

Also removed the duplicate decl, and the unnecessary __INTRODUCED_IN
that either does nothing for types, or is actively harmful (pretty
sure it does nothing), and the accompanying incorrect "introduced in"
docs.

Flag: no
Bug: None
Test: treehugger
Change-Id: I9432f1146288dcb691e5f317887791cc94b120fe
diff --git a/include/android/surface_control_input_receiver.h b/include/android/surface_control_input_receiver.h
index bdc5249..f0503f6 100644
--- a/include/android/surface_control_input_receiver.h
+++ b/include/android/surface_control_input_receiver.h
@@ -59,17 +59,13 @@
                                           AInputEvent *_Nonnull keyEvent)
                                           __INTRODUCED_IN(__ANDROID_API_V__);
 
-struct AInputReceiverCallbacks;
-
-struct AInputReceiver;
+typedef struct AInputReceiverCallbacks AInputReceiverCallbacks;
 
 /**
  * The InputReceiver that holds the reference to the registered input channel. This must be released
  * using AInputReceiver_release
- *
- * Available since API level 35.
  */
-typedef struct AInputReceiver AInputReceiver __INTRODUCED_IN(__ANDROID_API_V__);
+typedef struct AInputReceiver AInputReceiver;
 
 /**
  * Registers an input receiver for an ASurfaceControl that will receive batched input event. For