Merge branch 'CyanogenMod-cm-10.2' into cm-10.2

Conflicts:
	BoardConfig.mk
	rootdir/fstab.smdk4x12
	rootdir/init.target.rc
	selinux/file_contexts
	selinux/mediaserver.te
	selinux/ueventd.te
i9305: use opensource camera hal, remove camera blob

Change-Id: Ibb9bcd00aeddc84e6fee4426a147d434e12eeaa0
Merge branch 'CyanogenMod-cm-10.2' into cm-10.2
remove ini.smdk4x12.rc
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'kbc/cm-10.2' into cm-10.2

Conflicts:
	rootdir/fstab.smdk4x12
	rootdir/init.target.rc
	selinux/file_contexts
	selinux/mediaserver.te
	selinux/ueventd.te