Merge "Measure text in 1 pass" into pi-dev
am: 322d934e02

Change-Id: Iee665e6974331ea343fc84ae0643640e9b904d9f