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

Change-Id: I8ba3ae582dc12e4ca00d6c34b06b4e69a2f93de7