Merge "A cleanroom implementation of the org.json API."