Merge "ART: Fix arm mterp shadow handling"