Fix includes for media-caf

Change-Id: I5d6dedbb9ba03fc313ab27f91bf83376fa20a7a9
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1