Merge "Remove AFileDescriptor_{get,set}FD" into sc-dev