Merge "Fix Paint#measureText Tests" into gingerbread