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

Change-Id: I39fabb78d279dbff553efe345eb1a136878b892e