Merge "Remove dead file include/media/thread_init.h"