Merge "ART: Fix issues with SplitBlock"