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

Merge commit 'd15a18bdd2762524d3aff505eea5bd7714b10a6c' into gingerbread-plus-aosp

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