Merge "logging: Remove special android logging handling."