Merge "Bug 9092: revert to org.json temporarily"