Merge "Abolish source code overlay and inroduce overridable src dir"