Android 7.0.0 Release 32 (NBD92F)
am 10ebdb2e: Fix Mac build.

* commit '10ebdb2ed235c5fc70d72ba11c7e7d2caf4b3296':
  Fix Mac build.