Merge "Improve error messages for bad modified UTF-8 strings passed to JNI functions." into dalvik-dev