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

* commit 'd5538758af0f6fea0695d3682e9aad2613ab9192':
  Rename file descriptor listener API.