[automerger skipped] Merge "Unlist libunwind as a critical component" am:...

[automerger skipped] Merge "Unlist libunwind as a critical component" am: b636b0cf am: 4b5c043b am: 138cd7b4 am: 53fc8639 am: 92f6a827 -s ours

am skip reason: Change-Id I81882a4634ff4d397abe8a7cf5ff15a22a3eed2f with SHA-1 9355aeba is in history

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

Change-Id: Ie9fe18b6a9242b3703467234299ae863d4956082