STYLE: One declaration or statement per line

Change-Id: Ic2d4ad90ab04739520143ddd240863926f1f30f9
Merge topic 'OneStatementPerLine'

146b46c STYLE: One declaration or statement per line