Merge "Replace hidden getFileDescriptor$()"