Merge "Remove C++ headers from the platform directories." into gingerbread