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

Change-Id: Id795e6300112636c5c5d2e28afd0b78a8d3011d5