Support out of tree build for traditional make. Backport of r1541744 from trunk plus additional include path item already present in trunk.