Merge "Remove now unneeded #undef in __cxa_guard.cpp" am: 5dea560e4c
am: 37ba89a702

Change-Id: Ia82f762aa3fdb827110618cf1f2935e0b9f6b660