Update CMakeLists.txt and Android.mk. Fix typo.