staging: prima: Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.04.007.066

*kk_2.7_rb1.43

Change-Id: I363cdb920ab83b2b772361b2ed7b7bb61e0c118c
radio: iris: transport: move radio_hci_smd_init to __init section

Change-Id: I37aba71dc5fdee00054172ed46a20d93c3e77766
radio: iris: fix smd init when iris-transport is not compiled as module

Change-Id: Id0d9a36f93ec387e08be3d041e60113d2cf75aa8

Conflicts:
	drivers/media/radio/radio-iris.c