camera: add more htc parameters

Google Edition

Change-Id: I67968ea749dec0bf3810110f99bccdd3edee3428
Fix includes for media-caf

Change-Id: I5d6dedbb9ba03fc313ab27f91bf83376fa20a7a9