Reformatted to satisfy PHP_CodeSniffer

* Removed inline tabs.
* Removed pretty formatting of key-value pairs.
* Other miscellaneous formatting fixes.

Change-Id: I86170714dc22a8654027a8351e8d28226e822183
Merge "Reformatted to satisfy PHP_CodeSniffer"