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

Change-Id: I7ed0ad2c02bc8d403039409c8ad11d065f1c3dd8