updated android toolchain to ndk-r8e with more, but not complete c++11 features

- thread and mutex library is now available
- std::string::to_string() still missing
- remove small obsoltete include path for android built
- removed obsolete todo since there is no way to implement this more easy in c++11 as we already did!
Merge branch 'scripting' into dev
fix merge bug