Merge "Use -Werror in frameworks/base/core/tests/webkit/apk_with_native_libs"