Add optimized build directory

Change-Id: Ie07dfb5efa12e6af65a4a067d3e243262f919baf