Merge "Do not use test_per_src in libs/gui"