Revert "Remove ENABLE_SERVICE_CONTROLS for build on Yosemite"

This reverts commit 53adb8f46df5886cdccae910d8b01b3520160d61.