Merge "Use -Werror in external/libcap-ng" am: c5a85815e2 am: 68b050049c am: 5e45fbcb70
am: 95977907cc

Change-Id: I25a3c2f5203dd6647be3f7d8d242328948218b3e