Merge "ART: Fix compile-time-init fail"