Merge "Re-apply ndk-docs rule."