[automerger skipped] Merge changes from topic "soong_support_libs" am: 497a4359c6 am: 6fb62f4a10  -s ours
am: 4642cf2ef8  -s ours

Change-Id: I66fd91b620bc2c80ec8973a9ea371cbcf3a7096a