Merge "Revert^2 "ART: Add heap filter support""
am: 6c8ce9fa35

Change-Id: I17225be1b363e7b5de60c478cd3fc1b1ea2ef77b