Merge "liblog: __android_log_error_write in vndk" am: ae10af6050 am: 685b39d53b am: d525216946
am: 166f74db70

Change-Id: I92eda1e2c99dcf84ee199e0c59280ed5416405f6