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

Change-Id: I546d2fd12e3c57fee7ebcf8d3e3a5b56b57f1163