Merge "Add missing typedefs for C compat." into main am: d575c5b784 am: a9f1356c85

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3205910

Change-Id: I58a1515b982e4bd87cc93ea0d02987c7c9208e07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>