Sort out some odd file permissions

Bug: 71933
Change-Id: I520ee83a9b4d6adec4b430238640cfd58b49aeb4