Merge "Track update of org.json API"