Merge "Track update of org.json API"
am: c5a65bc152

Change-Id: I9f6df94ef58488a62558ee31e549c5e71a726f8a