Fix merge conflict from backout of bug 872806
Bug 886287 - OdinMonkey: Push the descriptor/argc filling the full pointer size, r=luke
Bug 886255 - Let activatation of inactive JitActivation behave more closely to the construction of active JitAction, r=jandem