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

* commit '7baa13f6d6ffa77e35e3596018efa5ca9a1febf7':
  recovery: Switch to clang