Fix includes for media-caf

Change-Id: I5d6dedbb9ba03fc313ab27f91bf83376fa20a7a9
Typo in CameraParameters::set

Typo: 'key' --> 'value'

Change-Id: Idd0426263cf2125a796406abaf6f29f04f425fe4
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_av into jb-mr1