Merge "Use -Werror in system/core/libnativebridge" am: 52013bc3d4
am: d164933fee

Change-Id: Ifefa647f3e9270abd049a90b265b015b3830c3db