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

Change-Id: Ie95d8a2705a0017378e63ad0368d4a2a714bf36e