Merge "Purge more of development/ndk."