update to match msm7x30-common

Change-Id: I86e78c57e84ba5b96ef137302f0bd965a733a009