am 36959302: am 8704ada3: Merge "Fix clang warnings in bionic."

* commit '36959302a334499c7d2ddf4a090e2ab7e3a8ae1d':
  Fix clang warnings in bionic.