Switch away from tearDown for BaseTests.

tearDown is never the right hammer.

Change-Id: If17ae653e25d4fba2b768cb569a573467448ccef
Merge "Switch away from tearDown for BaseTests."