Merge "Use exported headers instead of copying" am: e0debcf33e am: 881cdcd155
am: 6ce1735bdb

* commit '6ce1735bdb79e551d9a6cc2819950ee900e9315f':
  Use exported headers instead of copying