Merge branch 'cm-10.1' into phablet-10.1

Conflicts:
	smdk4412-common/proprietary/Android.mk

Signed-off-by: Humberto Borba <humberos@gmail.com>