Merge "ART: Fix GenInlined functions"