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

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

Change-Id: I3c5e43da8ca8fccd2c269d52ebed94e049fec121