Moved android_errorWriteLog calls under #ifdef __ANDROID__ am: 109dd2989f
am: e6263ee465

Change-Id: Ib5a1a04957d7f4f666bb685ca912c7918dc2ccca