Feature/ready for ndk build