Merge "Merge "Reference libcore, conscrypt and icu sources directly" am: 77481306 am: 0843760b am: a1248cae" into rvc-d1-dev-plus-aosp