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