Merge "Remove more crap from development/ndk."