Merge "libcutils: remove unused "jstring.h"." am: e2adc14803
am: 94879d3b9f

Change-Id: I612227daf439ae960cd9c37039a77b0dc16168cc