Merge "Add ANDROID_LOG to supress android specific logs"