Merge "Strip debug symbols from modules (fixup)" am: 173149f1 am: 929ddc7f am: 1b2e5112 am: ca9617ff

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

Change-Id: I200c7a5e4a7d02c11f60ac124e86e5dcd5f2cdcc