include: updates for 4.4

Conflicts:
	include/system/camera_metadata_tags.h