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

Change-Id: Ic53e9e8f34c2dc1d13583def028bac8b417ffff8