Merge "Reference libcore, conscrypt and icu sources directly" am: 77481306a7

Change-Id: I9615b9f3f43e2ebf87cdfd8658f801dc4e7893d3