Merge "Don't create sp<> to stack allocated mHwSvc"