Fix stack-pointer constructed sp<>.
am: e951f2a640

Change-Id: Ic04ef9397d58e230432d130eb08c1696eca605b0