Merge "Add nolint for implicit borrowed_fd constructors" am: 8987f061c4
am: 2d9148abb2

Change-Id: I190836f1b3e801decf6b39c448d6254c7806d8e1