fix compile error in some macros.
fix compile error in some macros.

InderKumarRathore/DeviceUtil,RyanTech/DeviceUtil,InderKumarRathore/DeviceUtil,cnbin/DeviceUtil,InderKumarRathore/DeviceUtil,WilliamRen/DeviceUtil