Merge "Unhide __cxa_begin_cleanup and __cxa_type_match needed by libgcc.a"