Merge "Add non regression unit test for Paint.measureText() and long strings - DO NOT MERGE" into ics-mr1