Merge commit '4cf84e254ae75b524e1cacae499a97d7cc9e5906'

* commit '4cf84e254ae75b524e1cacae499a97d7cc9e5906':
  Drop some unnecessary config.h #includes

Merged-by: James Almer <jamrial@gmail.com>

diff --cc libavcodec/thread.h
Simple merge

diff --cc libavformat/tls.h
Simple merge

diff --cc libavutil/aarch64/cpu.h
Simple merge

diff --cc libavutil/arm/cpu.h
Simple merge

diff --cc libavutil/cpu_internal.h
Simple merge

diff --cc libavutil/ppc/cpu.h
Simple merge

diff --cc libavutil/x86/cpu.h
Simple merge