Merge "Avoid static initialization of Layout from TextUtils"