Move more utils into paintutils

Change-Id: I1eb3fd52386bc61a592da235533e40b509eeec24
8 files changed