Merge "Turn on -Werror for recovery"
am: 695ef7cacc

Change-Id: If8cb1fd9470c4ae6798dc4ecf1707c5eb40b877e