Merge "Add a way to turn off unique_fd's operator int." am: 971bae0bcf
am: 7653723999

Change-Id: I06811b1e5ff3d45e4b0490bf00d1608bdf1ce1c4