Merge "Apply patches from upstream ICU for Bidi class"