am d32d8692: am d15a18bd: Merge "Remove C++ headers from the platform directories." into gingerbread

Merge commit 'd32d86920318f180e0db7b85435f1d5f520bff82'

* commit 'd32d86920318f180e0db7b85435f1d5f520bff82':
  Remove C++ headers from the platform directories.