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

* commit '0e9fed3eca4830980804aea1cec341be9abc26f9':
  Move trampolines to thumb2 instead of ARM