Merge "Libbase: NOLINT legacy unique_fd operator int"
am: d9e73a009b

Change-Id: I718c08d8cda742627abe192eec6e2c1ed3ac2c83