Merge "libcutils_test: static libjsoncpp"