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

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