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

Change-Id: Ic06579d452da17efe6e9679b7ab20495fee1afb5