Changed for new sdk/ndk