Merge "init: add missing O_CLOEXEC" am: 687b55261c am: 401d0013cc
am: aaf75969ec

Change-Id: I0484084380a972f20ed17eb14e32095936f97871