Merge "Fix surfaceflinger file descriptor leak"
am: af2fbb0ccc

Change-Id: If21d062e144dd13064c0c3e8021523a8bf20b864