tree 504e779dcc0d2da6aab09a5a0a86628c86de3df1
parent 7c3ab894437a6e12eacb657a9964968446672f19
author Zhi Dou <zhidou@google.com> 1679517042 +0000
committer Paul Duffin <paulduffin@google.com> 1680004486 +0100

Fix incorrect cherry pick

Change https://r.android.com/2507369 accidentally reverted some of the
changes from https://r.android.com/2507370 and that broke the script.
Unfortunately, that was not picked up by TH.

This change reapplies those changes.

Test: atest mainline_modules_sdks_test --host
      packages/modules/common/build/mainline_modules_sdks.sh
Bug: 254111089
Bug: 275471775
Merged-In: I94989519011e31c7db33656c6730c4f8fd5e0a4f
Change-Id: I42f9cdc7ada0ec9cafbfc381db67e4942a29421a