Merge "ART: Make trampoline compiler pointer-size-safe"
am: 1d97f949e8

* commit '1d97f949e807e963dd92dcf9ac38def5301d555a':
  ART: Make trampoline compiler pointer-size-safe