Merge "Fix clang warnings in bionic."