Merge "Remove outdated javadoc patch for android_icu4j"