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