- More NDK/MSDDK compatibility fixes.