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

Change-Id: I86c8144cfdf36afe5ba760379cd0709a42804abd