[automerger skipped] Do not fail if the tombstoned output fd is a socket or pipe.
am: 7764828178 -s ours
am skip reason: change_id Id346d6e2bce313473190538505f2f071cdc54df5 with SHA1 b9f1d3e5f1 is in history

Change-Id: I2ea0e0075d72579dd595874376bc2df607d74e8a