Merge "Make runtest --path smarter when choosing path to build."