Merge "Use -Werror in libnativehelper/tests" am: e70c5c000f
am: 6f67e5d833

Change-Id: I4afbab62e46a726ebdc466df5d7f6d355800816d