Merge "ART: Remove workaround for bug 34659969."