Merge "Add correct LOCAL_CFLAGS to compile with global -Werror."