Reconcile with ics-mr1-release

Change-Id: I90f80bed70319b9973996b74f78b421b87eef8e7
diff --git a/include/cutils/log.h b/include/cutils/log.h
index 42d7382..5a7c2e1 100644
--- a/include/cutils/log.h
+++ b/include/cutils/log.h
@@ -79,6 +79,7 @@
 #else
 #define LOGV(...) ((void)LOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__))
 #endif
+#define ALOGV LOGV
 #endif
 
 #define CONDITION(cond)     (__builtin_expect((cond)!=0, 0))
@@ -92,6 +93,7 @@
     ? ((void)LOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \
     : (void)0 )
 #endif
+#define ALOGV_IF LOGV_IF
 #endif
 
 /*
@@ -162,6 +164,7 @@
 #else
 #define IF_LOGV() IF_LOG(LOG_VERBOSE, LOG_TAG)
 #endif
+#define IF_ALOGV IF_LOGV
 #endif
 
 /*