am 37e5a941: Merge "Avoid static initialization of Layout from TextUtils"
automerge: 86b9cc3

* commit '86b9cc30099cf0836484a5231686cb1d85ebfdca':
  Avoid static initialization of Layout from TextUtils