Fixed some undesired or incorrect macros, which can cause build error. This is a resubmission of PR (#30086) Signed-off-by: Lingao Meng <menglingao@xiaomi.com>