Merge "Fix includes for other media variants" into cm-11.0