Merge "ART: Fix frontend to allow possibility of multiple code units"