Merge "access_vectors: re-organize common file perms"