Merge "Ignore unused generated .orig files in android_icu4j/"