Lets clean up any old builds before we start.

Change-Id: Ic1d0d2a09e1185462e65544b5061fc8fea2a8770