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

Change-Id: I078ac9a87fe8bd3c7358242f1d2b77df3e87dbae