Merge changes from the PNaCl repo.