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

Change-Id: I9fe5806c0aac9c80b9da0160f28e6ba244428715