Merge "init/service.cpp: fix FD leak for services with consoles" am: 4173d9b57c
am: 869ce5d40a

Change-Id: I10da3853a13192ed91a405894a96086262be2aa2