Merge "Reland "libcutils: remove unused "jstring.h"." am: a22599df58
am: 13e64377b3

Change-Id: Ic3a97d661cd9e4b46f2628b07da59e22320bbd9e