Merge "ART: Use templates for VerifyInstruction" am: 542bbf760b am: 92feef8874 am: 4d49bb719b
am: 3671a2c415

Change-Id: Idc022be41309c19a0cbbfc2cff16ff2d4641a14b