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