Merge "Several ndk documentation updates."