moto_msm8974: Fix strange inherit order.

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

Conflicts:
	slim.mk