Merge "Remove intermediate src dir"