Merge "Revert "Revert "Add a way to turn off unique_fd's operator int."""
am: fe1d1e815f

Change-Id: Ifee0b9ccc107361780f79cfde8a1c7db2a849a7c