Merge "Change wtf errors from ASSERT to ERROR."

    static int wtf(int logId, String tag, String msg, Throwable tr, boolean localStack,

            boolean system) {

        TerribleFailure what = new TerribleFailure(msg, tr);

        int bytes = println_native(logId, ASSERT, tag, msg + '\n'

        // Only mark this as ERROR, do not use ASSERT since that should be

        // reserved for cases where the system is guaranteed to abort.

        // The onTerribleFailure call does not always cause a crash.

        int bytes = println_native(logId, ERROR, tag, msg + '\n'

                + getStackTraceString(localStack ? what : tr));

        sWtfHandler.onTerribleFailure(tag, what, system);

        return bytes;