Merge "Move the jni codes in a subdirectory of android_icu4j"