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

Change-Id: I88043552adbefc7fce8e6b00e78e553bea945a0d