Android/MacOS X build support

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

This patch looks good to me. acked.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk/I/GkACgkQrlYvE4MpobMfOgCfV5RqujcudAyC2S+KmM0flSKR D2EAoLT4JWczo1jdeTtcSZx8SE/pMBzn
=t01z
-----END PGP SIGNATURE-----