Merge "init: clean up file / socket descriptor creation"
am: c8620ddafe

Change-Id: I0d33e2f797147f1c6a49e2b323b7ac09f93604c9