Merge small whitespace and permissions changes from google/pu.

These differences must have cropped up somehow in either mirror2svn or
svn2git.  None of them look significant, but this commit reduces the
delta between master and google/pu.

Change-Id: I8632b2981bf0c1398c7acac4bfb5ec262257e7ac
5 files changed