Upgrade ndk requirement to r5 (it ships a better compiler) and cleanup configure...