Merge "Use -Werror in external/valgrind"
am: 9187cb4ce2

Change-Id: I44538d4de2e62c913b6ad041208c29081dedb082