Revert "Fix android build"
Revert "Fix android build"

This reverts commit d73aa2df5441108c199d2c2a3e1c86f24d8673d2.

webmaster128/botan,randombit/botan,randombit/botan,randombit/botan,webmaster128/botan,webmaster128/botan,webmaster128/botan,randombit/botan,webmaster128/botan,randombit/botan