Merge pull request #170 from chrox/master

add multi-touch support for Android input module
fix Android build of luasocket luasec and thrift