Merge changes from topic "soong_support_libs"
am: 497a4359c6

Change-Id: I670e82efa1ea245f84ee4cf57f448dc111af05aa