Merge "Use -Werror in external/netperf" am: fe133622d1
am: 5cb77b2e10

Change-Id: I7abdb716fb6bc642a09858e52cce72139916477f