Merge "Remove __ANDROID_USE_LIBLOG_* guards"