msm8960-common: unified bringup

Change-Id: I1d99433b2681f33a2d9b0e006f1a3333ebd8b100
Merge "msm8960-common: unified bringup" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	loki/loki.sh

Change-Id: I7e673e790bdabd63691acb3dec25021b9ed6c922