Merge changes I4580e60e,I23b77414

* changes:
  Let DSUEndtoEndTest unsparse super.img if needed
  Clean up temporary files created by DSUEndtoEndTest