Merge "Change from SkDeviceProperties to SkSurfaceProps."