CMake and Android.mk files updated