Merge "recovery: remove LOCAL_CLANG" am: 8eb496967a
am: c462a793bb

Change-Id: I7baf2b6917b3ad1b86d9d7e06d8be456aea7c221