Merge "libcutils_test: static libjsoncpp" am: 7681f71b am: 5aaff347

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617474



Change-Id: I3891643d7ec4a7b6dd7c5a2aa66f9a42d0564f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>