Merge "ART: Use templates for VerifyInstruction" am: 542bbf760b
am: 92feef8874

Change-Id: I8558550fa8f05cbdfc23562ceb23f8e6af1892bc