Adapted as needed and gbuildified by tml. For the files that actually
are Objective-C++ use the .mm suffix.

Change-Id: Ieec40b722df6463a1061d19d38154828ff8adca2