Fix includes for media-caf

Change-Id: I5d6dedbb9ba03fc313ab27f91bf83376fa20a7a9
Merge "Fix includes for media-caf" into jb-mr1

Change-Id: I8ffbf50383296be490a1f96a3e2a75d950f8b2b5