Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bc am: d2cd8b4d30
am: 776ea9b464

Change-Id: I97cf01e270fab31e0859b8fce5a1889d9ae3d2c3