Merge \"ART: remove gcc cruft from the makefiles\"
am: df638c66d1

Change-Id: I370c6a829207d657b6a67b259773ab28529ec373