Merge "Fix surfaceflinger file descriptor leak"