Resolve dir path in early stage
am: eba3ed1a97

Change-Id: Iecd401ef92cb0118cdd85fecab9d933aa0bd2240