Fixed msm8660.mk conflict from last commit

Change-Id: I970a956c8db12a6ca1f1c265e841471b5f184eda