Fix includes for media-caf

Change-Id: I5d6dedbb9ba03fc313ab27f91bf83376fa20a7a9
Fix includes for other media variants

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

Change-Id: Icfd33be4ee16f24919fe2f8f44cb08f3df1d0a4c