Revert "SPM: Use flag to indicate NS Agent"

This reverts commit 27f9a49508547320c50056a52a372674c27771eb.

Reason for revert: Breaks dual-core. Will re-submit it as part of agent update later.

Change-Id: I7532570476c8d543297c7f6f2e871413d5e77221
7 files changed