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

Change-Id: If21c1b67a16061618c91496ec5eeb69e38f4f14f