[automerger skipped] Merge "[DO NOT MERGE] platform/build/make - S is now REL"...

[automerger skipped] Merge "[DO NOT MERGE] platform/build/make - S is now REL" into sc-dev am: 4ef2e34c -s ours am: 57df51ed

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14884214

Change-Id: I2b074b45c5baf862b180118d4640bf056471533c