Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t." am: 0f3d90eec8  -s ours am: cd53e91851
am: 28f67840c6

Change-Id: Ifd1e474ff8b34e13dc66874008ea4b4346816c67