Merge "Turn on -Werror for recovery" into nyc-mr1-dev-plus-aosp