am 3f9db6af: Merge "recovery: Switch to clang"

* commit '3f9db6af3d8f8659637da7288e9e2bceda4366d0':
  recovery: Switch to clang