Merge "Revert "ART: Ensure plugin is loaded on AttachAgent""