Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t." am: 0f3d90ee -s ours am: cd53e918 Change-Id: I9c1955309c1669c49b0f7060c22de4767360a7c4