am 2ce745c0: Fix cpplint whitespace/braces issues

* commit '2ce745c06271d5223d57dbf08117b20d5b60694a':
  Fix cpplint whitespace/braces issues