Merge "Remove unused API definitions from development/ndk."