Merge "ART: remove gcc cruft from the makefiles"