Merge "Revert "libcutils: remove unused "jstring.h".""