Merge "Do not block SIGTERM in init's child processes"
am: 176afbbedf

Change-Id: I26bcb38bf2082da18e753afe5761b6c0460fc85c