Merge "benchmark: use getExternalFilesDir() to save results"