Merge "Strip debug symbols from modules (fixup) am: bb726614 am: 74df52f1" into rvc-d1-dev-plus-aosp am: 35a9ca42

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

Change-Id: If73980185c84d4e78537ca6ec5d07c5c895e453c