Merge "Use absolute paths in tests."
am: 9c3abd4631

Change-Id: I5fa4e8ae993b78fc52d8ed1d6c78e6522072931a