Merge "Update to new minui text API" am: 335502453d  -s ours am: b6a8454cd5 am: 11c19d9b15
am: d76eb17eef

Change-Id: I2e4a9ef99aea348064e42016051ef27c5800079d