Merge "Fix documentation for NDK API" into main