Merge "liblog: __android_log_error_write in vndk"