Merge "Re-enable -Wall and -Werror that were lost in a merge"