Merge "Undef before redefining macros"
am: 028c26c2d0

Change-Id: Ibfe534eca2845106f419150bcb1a027a82e77453