Create branch to keep WIP patch for modular build.


[SVN r85883]
Make predef tests build in modular layout.


[SVN r85973]