Use __DIR__ instead of the CWD

Change-Id: Ib5bdf39f9b6afaf9a01174dbb8d381dd4fe1d40b
Merge "Use __DIR__ instead of the CWD"