Merge "In Android framework, make tools depend on jsoncpp" into master-skia

https://skia.googlesource.com/skia/+/f01a6c3

Change-Id: I821177944866bf1aaee703a38fb4dc6f1dd79495