Add support for passing pre-bound file descriptor am: 789db9e676
am: b18c9afa9f

Change-Id: Iad88ca7ba0501ab8b17f92a001c6912fa6bb5571