Merge "Update to new minui text API" into cw-f-dev
am: d69818c53c

Change-Id: Iaba2b147e6a41745b771d57fda1b507bbd0a93bb