This reverts commits: 8d79ed6740 19fdcb5234 8d79ed6740 Because WebRTC (at least) includes our headers in an extern "C" block, which precludes having any C++ in them. Change-Id: Ia849f43795a40034cbd45b22ea680b51aab28b2d
8d79ed6740
19fdcb5234