support for latest android ndk
Merge branch 'sabine' into bluestar01