am 23d99f15: am 1b60d4ff: Fix 64-bit build error.
am 23d99f15: am 1b60d4ff: Fix 64-bit build error.

* commit '23d99f1554d9d14d46459041ba434b0406927849':
  Fix 64-bit build error.

google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt