Merge "ART: Add INVOKE_TRAMPOLINE and imt_conflict stub to 64b architectures"