Merge "benchmark: Add a build target that's not Android-dependent"