Merge "Use -Werror in system/core/libnativebridge"