Merge "Allow statsd to be given empty config." into pi-dev
am: 8512630f8b

Change-Id: Ia286290f6c239273d7d04b6adcceecf28c365dcc