am 420f3303: Merge "Add a cleanspec to ensure that the headers get exported."

* commit '420f33034007d0e0d7366023346565538e626b49':
  Add a cleanspec to ensure that the headers get exported.