Additional NDK9e fixes and cleanups.