Merge "Change the Bidi class over to ICU4J."