Merge "Revert "ART: Add heap filter support""