Merge "plat: pass -D option to BL*_CPPFLAGS instead of BL*_CFLAGS" into integration