Merge "Revert "libcutils: remove unused "jstring.h"."" am: 4b8e6b673f am: 1967bf3f07
am: ab7be58614

Change-Id: I27e1101ebb984b12262190ad953b8ba5815d1c16