Merge "Add a comment on thread-safety for NDK" into main