Merge "Use unique_fd with the clear ownership." into pi-dev
am: 1ebfc94aa1

Change-Id: I478af4173025470829785ef99e0444609c36ddf0