platform/cts - S is now 31 Bug: 171506470 Test: Build Change-Id: Ia6c37a8dd5240a7deb97287fa10f9fae8403878a Merged-In: Idc5dd031d202739d92d5d714accebadf1acd1749