Merge "recovery: Switch to clang"