Revert "Remove ENABLE_SERVICE_CONTROLS for build on Yosemite"

This reverts commit dac91edebb9613208412add7444d3331ffb5a750.