Merge "Revert "ART: Workaround for b/20019689""