Merge "Turn on -Werror for recovery" into nyc-mr1-dev-plus-aosp
am: 209e5acf4a

Change-Id: Ie13be805792a3433d58c2805f8325dfe78795bd4