Merge "ART: Fix overlapping instruction IDs in inliner" am: 31b743106d
am: db22ffa327

* commit 'db22ffa327a7945b69ada317abd1f5f5222d7c1c':
  ART: Fix overlapping instruction IDs in inliner