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