Merge "Remove unnecessary dependency on android_icu4j_resources_lib"