Merge "Use -Werror in libnativehelper/tests"