Merge "Reference libcore, conscrypt and icu sources directly" am: 77481306 am: 0843760b am: a1248cae Change-Id: I3346aff41598f7c3a96db72afea145ddd6f46a4d