Merge "Remove ro.statsd.enable property"