Moto_msm8960: Add PRODUCT_DEVICE for ota purposes

Change-Id: Ic199cdb5c4385586a50961e19417bbbcf2b52e82
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
moto_msm8974: Fix strange inherit order.

Change-Id: Ifd193714ae8db456df4304d34b01880703fe16e2
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Merge remote-tracking branch 'slim/kk4.4' into ose

Conflicts:
	ose.mk