Add support for passing pre-bound file descriptor am: 6d04d81372
am: 9c455d2eeb

Change-Id: I5f3e8fe273764a193eb200935bb7d4f047f38b4d