serrano: Add device specific options removed from msm8930-common

Change-Id: I7b295a8e8aeddb7924c197cf3ee29bb71786a93c
Merge branch 'cm-11.0' into kk_mkt