Merge "Force clang for bionic"