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

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