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/HkACgkQrlYvE4MpobMNAwCfRY2cgFBbTSzROw1YqW49gEDP mYoAnRM0bgBzJL1FmLLxg5bD+yV2y3Yg
=35bV
-----END PGP SIGNATURE-----