Merge "Remove ART aggregation of libcore, conscrypt and icu sources"