Merge "Fix surfaceflinger file descriptor leak" am: af2fbb0ccc am: ee87482e6d
am: 735d32406d

Change-Id: Iadc2fdb10b6648e36d304dd22fd1119a3b03d728