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

Change-Id: I87f37b1ecc15b0b7800c0269f5a27df59125c73f