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

* commit '881cdcd15595a3518f89070957c18d128c3edd7e':
  Use exported headers instead of copying