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

Change-Id: I5332c92ada750b0a6b6c8ec6ff947627904d3337