Merge "Revert "ART: Reduce the instructions generated by packed switch.""