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

Change-Id: I29a733b45b7393854363b4d3cf82462bad04dbf0