recovery: Switch to clang am: 7101b2e285  -s ours
am: 29cc06e50c

* commit '29cc06e50c3702e1835c1af911f5d2c69699e1c7':
  recovery: Switch to clang