Merge "Revert "Enable init.rc for statsd to start statsd by default in boot time""