Merge "Fix the target Linux builds of ART"