Move Garbage Collection to build

Change-Id: I44e6a07e47c8a9eb60277943563f3e66e8ddf03b