am f69863b3: Fix cpplint whitespace/newline issues

* commit 'f69863b3039fc621ff4250e262d2a024d5e79ec8':
  Fix cpplint whitespace/newline issues