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