Don't try to read temparature file if TW_NO_CPU_TEMP is set to true.

Otherwise, recovery log gets filled up with
"I:Cannot find file /sys/class/thermal/thermal_zone0/temp"

This also fixes build warnings due to duplicate definition of TW_NO_CPU_TEMP.

Change-Id: Ib7fdcd103d6684249c38c8b14ec85f2faba158f6

data.cpp

@@ -891,6 +891,10 @@ int DataManager::GetMagicValue(const string varName, string& value)
 	}
 	else if (varName == "tw_cpu_temp")
 	{
+	   int tw_no_cpu_temp;
+	   GetValue("tw_no_cpu_temp", tw_no_cpu_temp);
+	   if (tw_no_cpu_temp == 1) return -1;
+
 	   string cpu_temp_file;
 	   static unsigned long convert_temp = 0;
 	   static time_t cpuSecCheck = 0;