Merge "Matching benchmark directory change in soong"