Stop using junit classes in production

Bug: 35234437
Bug: 30188076
Test: make checkbuild
Change-Id: Ib24448a030f05bb43a62eecec91ba08249672426
5 files changed