am 022cf57f: am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev

* commit '022cf57f82e40a103c4a48c083a59d7fa4936668':
  Avoid static initialization of Layout from TextUtils