Merge "Update the new error reporting API in android.webkit" into mnc-dev