Merge "Matching benchmark directory change in soong" am: 73fd86bfc6 Change-Id: I6deb4d5cacd0342c03709296b36a91b90b59ee7f