Merge "Avoid closing invalid fds in GraphicBufferMapper"
am: 8260e06c50

Change-Id: I09e5f50a60c5968350c64eb42bbd8ada273a62e3