Merge "ART: Fix Makefile"