Merge changes I768f0948,I3d79bb35

* changes:
  Merge remote-tracking branch 'toybox/master' into HEAD
  Use NULL rather than 0 in vargs.