am 04371b44: Merge "Implement JSONObject.wrap, and use it."

* commit '04371b44f6fea50e0e6bb5c732e36f084f07e8a7':
  Implement JSONObject.wrap, and use it.