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

Change-Id: If46e94da60d2a345ad5fe7fad443c611bd82fa4d