Merge pull request #20 from wilx/1.2.x

Merge.
android/android.toolchain.cmake: Update from
https://github.com/taka-no-me/android-cmake/blob/master/android.toolchain.cmake.