Merge "Move trampolines to thumb2 instead of ARM"