Fix Android/org.json incompatibility (#13277)

Change-Id: I5ff4ae771420fae22e403bd7dcb3961f4ef53e14