4aff2e43c include/android: Define additional types in glib.h