Merge pull request #23 from per-mathisen-arm/master

Workaround for Android build issue with JSON library used