Merge "Revert "Update init.rc for statsd setup""