Merge "Remove android.icu.impl.ICUBinary.dataPath for apps targeting S+"