Try adding baseDir to targetDirectory for the block storage build.

Change-Id: Ibd454fd1aa3b71cadce23ed9f09f686e72438ec4