Merge "Terminate statsd on a few signals including SIGTERM" am: 99f231f3bc am: 41128933e4
am: 582a9b3d3f

Change-Id: I35a2b03000f0bd6f7f9743cf84639e8fd94e5b2f