Merge "Terminate statsd on a few signals including SIGTERM"
am: 99f231f3bc

Change-Id: I4a1f39eac54da861d88337a15e0c8e7a764a66f3