Merge "Revert "unique_fd: easier to forward declare"" am: 9d599c3ec6 am: 9d64cee049

Original change: https://android-review.googlesource.com/c/platform/system/libbase/+/1690407

Change-Id: Iad972b01a961610ee185a553aa047cd1a5174a5b