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

* commit '9488238e6afb4e327f8ab9c861df8a06cf53a5f5':
  ART: Add INVOKE_TRAMPOLINE and imt_conflict stub to 64b architectures