Merge changes from topic "b201944383_0114"

* changes:
  track mpeg2ts header layout changes
  Exporting headers for include_dirs->header_libs changes