am 33a939f4: Merge "New tests for JSONObject and for JSON\'s self-use."

Merge commit '33a939f4c016698866b495c5e752e8c16ccef0b3' into dalvik-dev

* commit '33a939f4c016698866b495c5e752e8c16ccef0b3':
  New tests for JSONObject and for JSON's self-use.