Merge "Mark Scanner benchmark as macrobenchmark."