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

* commit '37e5a941edb0ac5db6a4a4690827fa113c5443b1':
  Avoid static initialization of Layout from TextUtils