am bc8fa78f: am e9fac40c: am aa7d994e: Merge "Fix san-sangeles warnings with clang 3.1"

* commit 'bc8fa78f0348af77c32b2cdc8dbfd84838195163':
  Fix san-sangeles warnings with clang 3.1