Merge "Avoid closing invalid fds in GraphicBufferMapper" am: 8260e06c50 am: 8fe617eaad
am: 9ef13167c9

Change-Id: I2193d68e72ed234c2dc603ea485f89c1ea4eee19