Merge "ART: Add heap filter support"