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

Change-Id: Iecb06d633d3abd140d185d360add883c083ab05f