Merge "Rename file descriptor listener API." into mnc-dev