Tests fail on fugu: run-test-args: no such test directory Bug: 67649705 This reverts commit af2eee5c. Change-Id: Ief5fcdc9003f3daefa0b99c5113c8567e95e9ad9