am ad1e79fb: Merge "Move trampolines to thumb2 instead of ARM"

* commit 'ad1e79fb6871bee2b5e91560227ca7acddf99cb9':
  Move trampolines to thumb2 instead of ARM