Merge "Fix __android_log_assert to abort."