Merge "libcutils_test: static libjsoncpp" into android12-tests-dev