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

Change-Id: I3caa49b57d1a5a5ad282ac4c8460cf586edeb7c7