Merge "Matching benchmark directory change in soong" am: 73fd86bfc6 am: 08f098f140 am: d368bcdd5a
am: 3fec340445

Change-Id: I5af9d135873a0418480d20648b998f4e671815d2