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

Change-Id: I096802a65a414cee1ca0e4e7650202b9f9122852