Fixes compiling issue of using un-defined macros. Change-Id: Icf754083c9797c3e141ef247bcd4aa6288ef8877
Yaowu Xu authored