Revert "platform/cts - S is now 31"

This reverts commit a58b2dfdd1f943807fc1125b611408bcc6fa785e.

Reason for revert: breaks sc-v2-dev which still relies on "S" codename

Bug: 171506470
Merged-In: Idc5dd031d202739d92d5d714accebadf1acd1749
Change-Id: Ibe3dd38a5020bda91046c67460d1d1ea9d9eefc9
21 files changed