Various changes mostly for android ndk/sdk