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

    # Create root dir for Incremental Service

    mkdir /data/incremental 0771 system system encryption=Require

    # Create directories for statsd

    mkdir /data/misc/stats-data/ 0770 statsd system

    mkdir /data/misc/stats-service/ 0770 statsd system

    mkdir /data/misc/stats-active-metric/ 0770 statsd system

    mkdir /data/misc/train-info/ 0770 statsd system

    # Wait for apexd to finish activating APEXes before starting more processes.

    wait_for_prop apexd.status ready

    perform_apex_config