Updating Android SDK
Protecting against concurrent modification of JSONObject

Fixes #158