Merge branch 'cyanogenmod' into cm-10.1

Signed-off-by: Humberto Borba <humberos@gmail.com>
smdk4412-common: add SlimISP_BH camera firmware

Change-Id: Ibf1ec509c4fa4c7302b67d92de1aeeb103efa0d7
Merge branch 'cyanogenmod' into cm-10.1

Signed-off-by: Humberto Borba <humberos@gmail.com>
Merge branch 'cm-10.1' into phablet-10.1

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