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