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

Change-Id: Ied5bef6a4f2665ce0569a0e2fdd1797644cc6624