Merge "surfaceflinger: Fix range check for getFormat"