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

Change-Id: I881cc37308743e0573f0b735bd6e0ce0533906e2