acbf10c0a include/android: Define additional types in glib.h