Fix includes for media-caf

Change-Id: I5d6dedbb9ba03fc313ab27f91bf83376fa20a7a9
audioflinger: remove redundand ifdef

Change-Id: Iefc64cf477fd58a29984a9c198d84e876dbcf1c5
Camera: Add more htc parameters

Change-Id: Ica43a42f6ec6e25671b22536c768140469fb9824