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

Change-Id: Ib51b99446618262c11fd7061db542529e5a1c9ec