am 9b7085a4: Fix cpplint readability/braces issues

* commit '9b7085a4e7c40e7fa01932ea1647a4a33ac1c585':
  Fix cpplint readability/braces issues