fix subdir build paths

Change-Id: Ibbb4bd869aca632e3f4613442b2b35d55453deac