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