Merge "Add correct permissions to benchmarktest directories" am: 8c2d4d6146 am: cfce9d6ad9 am: 8008cc405b

Change-Id: Ic505c73fcbd294928aaa33da39b91051ae1e7225