Much better fix for the iOS text colour problem

Just use the same simple trick as for OS X in
OutputDevice::ImplLayout().

Thanks to Khaled Hosny for pointing out this.

This reverts commit 9aba69e8cc034526c53f6135a41fc62dc3c5dce3.

Change-Id: I27ba92ef8ebd1ebdb9eb74f670d8170649078881