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

Change-Id: I607e90419526757f7b15e6176c5814febebbdaa6