Merge "Remove SkDevice.h includes."