[automerger skipped] Merge changes from topic "soong_support_libs" am: 3e20d23cf7
am: a804215d9c -s ours
Change-Id: Idf3a6b61398b8d4b61309d9609fa78d5701d52d4
This commit is contained in:
3e20d23cf7
am: a804215d9c -s ours
Change-Id: Idf3a6b61398b8d4b61309d9609fa78d5701d52d4