Merge "Undef before redefining macros" am: 028c26c2d0 am: 46fbc9c701
am: f0f159e557

Change-Id: I127ffb4a7fada980f31271bac18e3640bcaf7547