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

am skip reason: subject contains skip directive

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

Change-Id: I5f0313064cf707213eb2ad984a1b115ff06a296a