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

* commit '8704ada3d8fae067ed48c2b6da5a1ba4ab062e1a':
  Fix clang warnings in bionic.