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

Change-Id: Id3a7dc51c56b4e13d6969dae14d6fa5e68b85057