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

Change-Id: Icba2ba28652614f1a34f4cec1b3fb2007fa2bd9d