Revert to org.json as Android JSON is not 100% compatible (#13944)

Update to new GWT which also uses the correct org.json dependency

Change-Id: I9414be188bf59975d01186a9daf83f0c170a88bc