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

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