am 0340f95b: Merge "Change the Bidi class over to ICU4J."

* commit '0340f95b122ed18aebb4991b1f8bcddde64effce':
  Change the Bidi class over to ICU4J.