Merge "ART: Add heap filter support"
am: 8b4e679b4a

Change-Id: If84f5ab84b7d4c65a6e50b8d5008b36853426bf9