Revert of Enable cpplint and fix cpplint errors in webrtc/*audio

webrtc/common_audio/signal_processing/include/spl_inl_armv7.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 
 /* This header file includes the inline functions for ARM processors in
  * the fix point signal processing library.
  */
 
-#ifndef WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_ARMV7_H_
-#define WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_ARMV7_H_
+#ifndef WEBRTC_SPL_SPL_INL_ARMV7_H_
+#define WEBRTC_SPL_SPL_INL_ARMV7_H_
 
 /* TODO(kma): Replace some assembly code with GCC intrinsics
  * (e.g. __builtin_clz).
  */
 
 /* This function produces result that is not bit exact with that by the generic
  * C version in some cases, although the former is at least as accurate as the
  * later.
  */
 static __inline int32_t WEBRTC_SPL_MUL_16_32_RSFT16(int16_t a, int32_t b) {
@@ skipping 53 matching lines @@
   __asm __volatile ("clz %0, %1":"=r"(tmp):"r"(n));
 
   return (int16_t)(32 - tmp);
 }
 
 static __inline int16_t WebRtcSpl_NormW32(int32_t a) {
   int32_t tmp = 0;
 
   if (a == 0) {
     return 0;
-  } else if (a < 0) {
+  }
+  else if (a < 0) {
     a ^= 0xFFFFFFFF;
   }
 
   __asm __volatile ("clz %0, %1":"=r"(tmp):"r"(a));
 
   return (int16_t)(tmp - 1);
 }
 
 static __inline int16_t WebRtcSpl_NormU32(uint32_t a) {
   int tmp = 0;
 
   if (a == 0) return 0;
 
   __asm __volatile ("clz %0, %1":"=r"(tmp):"r"(a));
 
   return (int16_t)tmp;
 }
 
 static __inline int16_t WebRtcSpl_NormW16(int16_t a) {
   int32_t tmp = 0;
   int32_t a_32 = a;
 
   if (a_32 == 0) {
     return 0;
-  } else if (a_32 < 0) {
+  }
+  else if (a_32 < 0) {
     a_32 ^= 0xFFFFFFFF;
   }
 
   __asm __volatile ("clz %0, %1":"=r"(tmp):"r"(a_32));
 
   return (int16_t)(tmp - 17);
 }
 
 // TODO(kma): add unit test.
 static __inline int16_t WebRtcSpl_SatW32ToW16(int32_t value32) {
   int32_t out = 0;
 
   __asm __volatile ("ssat %0, #16, %1" : "=r"(out) : "r"(value32));
 
   return (int16_t)out;
 }
 
-#endif  // WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_ARMV7_H_
+#endif  // WEBRTC_SPL_SPL_INL_ARMV7_H_