Merge \"Merge changes from topic \\\\'soong-sysroots\\\\' am: 65de8e446c am: 01efd46bca am: cce7b4f00a\" into nyc-mr1-dev-plus-aosp
am: 053034c057

Change-Id: I50e49432702d256a40dbe2d2971da4d3cc535ae0