Merge "Make HWUI makefile include external/skia/src/utils"