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

Change-Id: Iebbb0870b47a14b1636f2809f8c8940bf665d19f