Fix includes for other media variants

Based off http://review.cyanogenmod.org/#/c/51031/

Change-Id: Icfd33be4ee16f24919fe2f8f44cb08f3df1d0a4c
Merge "Fix includes for other media variants" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0