Merge "ART: Fix overlapping instruction IDs in inliner"