Merge "Remove obsolete rules to build runtests"