This reverts commit b66a96d7,
follow-up commit will fix w/o breaking JunitTest_framework_unoapi.

Change-Id: Iac12d52c2eb9a1e4ab09d24910cee1838cc7d883