Merge changes from topic \\\\'soong-sysroots\\\\' am: 65de8e446c am: 01efd46bca am: cce7b4f00a
am: dee194df54

Change-Id: I836ba1c1734f09df3645345ff7a8e9b7fdcac3a5