changes for android/cmake