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

* commit 'f789d45b24acc3745ccc97adb687502d488404f6':
  Avoid static initialization of Layout from TextUtils