Fix CodeSniffer errors and warnings

On files that are not .php and .inc.

Change-Id: Ida9304459367e75ca1aa3d55431e0ebcb95e0edb
Merge "Fix CodeSniffer errors and warnings"