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

* commit 'e0debcf33e942e64e8ee11f2f71787651be5bdd6':
  Use exported headers instead of copying