Merge "Use -Werror in external/libcap-ng" am: c5a85815e2
am: 68b050049c

Change-Id: Ib6e6ee23991ddd5b1ff4ff05b1bd4a433d37e5c9