Merge "Fix NDK documentation minor bugs." into main