Merge "Move android_icu4j_resources_lib to external/icu/android_icu4j"