Merge "Fix type of android_thread_func typedef" into main