Merge "Remove AFileDescriptor_{get,set}FD"