Bring up to 4.2.1 for msm8660

Change-Id: Ia03ab1e381e87c11ed56355d315a592fd1ef866c