AJCORE-307: Fix building services from top-level SConstruct.

Change-Id: If9633478b4155da508ec5976c249555575307163