there were a couple of lines in SC and SW where the code was using a
EV_CNTRL constant. I switched it to used the same-valued constant from
EE_CNTRL

Change-Id: I027183cc3b6e700bf365d48833e37eddc9b50f04