Merge "Turn on -Werror for recovery" am: 695ef7cacc am: 5269808bb0
am: dbde5cf1d5  -s ours

Change-Id: I0649c3db276212804118ab4a6d7ced150585af91