am 2d52182d: Merge "Fix wint_t in android-3 and android-8 to be consistent with android-9"

* commit '2d52182dfac91014c2975a1bb1afd99a3b14b4e9':
  Fix wint_t in android-3 and android-8 to be consistent with android-9