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

Change-Id: I8940d68e1a60ee800df6512da8c269edec7018fe