Merge "Fix wint_t in android-3 and android-8 to be consistent with android-9"