[3.6] Update org.json library to fix security issue

[3.6] Update org.json library to fix security issue #2923