Merge pull request #22 from inetic/master

Asio deadlock prevention + merged other branches + more
Added linux x64 support
Add env variable __ANDROID__ to conditions
Merge pull request #40 from linqcan/fixes

Add env variable __ANDROID__ to conditions
Fix typo in variable __ANDROID__
Merge pull request #41 from linqcan/fixes

Fix typo in variable __ANDROID__
Support for 64-bit host and toolchain, tested with NDK r8e and Boost 1.53
Merge remote-tracking branch 'lkalneus/master' into devel
Fixes undefined references when using Boost.Filesystem.

Currently only in 1.49 version of boost.
Re-add support for using a 32bit NDK on 64bit hosts

This is pretty much same as commit
8ae6be27d26c5174dfcb101dd31b98c5620e5b4f
from Michael Zoech.
Add install prefix
Support for NDK r9 by @pelya.

Conflicts:
	build-android.sh
Merge remote-tracking branch 'linqcan/fr-install' into devel