Merge "Upgrade jsoncpp to 1.9.5" am: d537ece935 am: 90de0e3376

Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1913907

Change-Id: I75e106b330758a1c78a30f2ace282baf0b3928a7