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

Change-Id: Ie940af51967da79589347648fe75a775fc61dcca