Some clean up for mark sweep files

Bug: 19534862
Change-Id: Ib619e8c4b9d902269d123baa18be56c94114e070
5 files changed