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

Change-Id: I7e15df3cb1e547026181e8b1635094f8b4c54965