DO NOT MERGE msm8660-common: update for lollipop

Change-Id: I406cb7109cca3878ab001fe845cc6da3903e7522