Merge "Remove magic number usage in SurfaceFlinger"