Fix APK-in-APEX tests by stripping away the variable @BUILD_ID in the
directory names.

Merge conflict fix to sc-mainline-prod
Test: atest StrictJavaPackagesTest
Test: CI

Bug: 226559955
Bug: 224589412
Change-Id: Ida1bded3a8288d1ca48f5de1cec75ef32190a3e2
Merged-In: Ida1bded3a8288d1ca48f5de1cec75ef32190a3e2
(cherry picked from commit 31eaf3918e249f089987114ad076f6705b0a186e)
Merged-In: Ida1bded3a8288d1ca48f5de1cec75ef32190a3e2
1 file changed