Revert "Refactor MeasuredText"

This reverts commit 75492afb1b6566c889025e9ca0a15a0d0fe422aa.

Reason for revert: 70146381

Change-Id: Ibb6433b5e02608326ef51cc16d8d5d8efa86beec
5 files changed