Merge "Fix test build targets."