Merge "chmod a-x on files that shouldn't be executable"