Android json build

Change-Id: Ifb9b58503d17ac6ecf8ae339f05b7f58250d4c77