Merge "Replace JNI portion of AndroidBidi with calls to ICU4J"