Merge "Add proto output of statsd stats in adb" into pi-dev