Merge "Revert "Update statsd binary path for apex""