Merge "Clean up TextUtils.doesNotNeedBidi()"